Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
3e96b5f
Merge pull request #17 from Pollak-Projects/main
TGyAkos Oct 15, 2024
1bcdddf
Merge branch 'main' into LandingPage
TGyAkos Oct 15, 2024
a00a6f6
Merge pull request #22 from Pollak-Projects/main
OHOKs Oct 16, 2024
74c19e4
ts now works as intended
TGyAkos Oct 17, 2024
883dfe2
added basic prisma model
TGyAkos Oct 17, 2024
5d9b44f
added basic logger
TGyAkos Oct 17, 2024
e7d1d0e
stated scaffolding Admin backend
TGyAkos Oct 17, 2024
8363b1b
almost added unnecessary logger
TGyAkos Oct 20, 2024
e3efc04
added the correct logger
TGyAkos Oct 20, 2024
e114832
added base schema.prisma
TGyAkos Oct 20, 2024
b0e83b5
added body parser middleware
TGyAkos Oct 20, 2024
153731c
added hopefully the final version of the logger
TGyAkos Oct 20, 2024
63bc243
added basic AdminUser backend and infrastructure
TGyAkos Oct 20, 2024
ec09fc6
updated gitignore
TGyAkos Oct 20, 2024
c51c26b
added AdminSubject controller
TGyAkos Oct 20, 2024
ab49625
Merge pull request #21 from Pollak-Projects/AdminPage
OHOKs Oct 21, 2024
df10378
Merge pull request #25 from Pollak-Projects/AdminPage
OHOKs Oct 21, 2024
e196ac4
Add files via upload
OHOKs Oct 21, 2024
170de6a
Add files via upload
OHOKs Oct 21, 2024
227dca5
Delete slots directory
OHOKs Oct 21, 2024
7d8f666
Delete Login directory
OHOKs Oct 21, 2024
0450899
Delete Prossesions - 1 directory
OHOKs Oct 21, 2024
d2ba689
Merge branch 'main' into LandingPage
OHOKs Oct 21, 2024
813b385
Merge pull request #26 from Pollak-Projects/LandingPage
OHOKs Oct 21, 2024
856bf86
updated schema.prisma
TGyAkos Oct 21, 2024
c7c48e2
added a todo
TGyAkos Oct 21, 2024
5664203
added functionality to AdminTopic endpoints
TGyAkos Oct 21, 2024
b896db6
Handled tailwind error
OHOKs Oct 21, 2024
69aabbd
Merge pull request #27 from Pollak-Projects/LandingPage
OHOKs Oct 21, 2024
e638940
Merge pull request #24 from Pollak-Projects/Backend/AdminPage
OHOKs Oct 21, 2024
2569894
Added error catching
IWillSettYou Oct 21, 2024
2d52018
Update schema.prisma
dancsikdavid Oct 21, 2024
8c252b0
Merge pull request #32 from Pollak-Projects/Backend/schema
TGyAkos Oct 21, 2024
09a5116
updated prisma scheme update commands
TGyAkos Oct 21, 2024
7db5343
Added error catching to all previously unchecked
IWillSettYou Oct 22, 2024
f63ac96
Merge remote-tracking branch 'origin/Backend/AdminBackendAllEndpoints…
IWillSettYou Oct 22, 2024
6d6737a
Merge pull request #33 from Pollak-Projects/Backend/AdminBackendAllEn…
TGyAkos Oct 22, 2024
941962b
schema.prisma has been completely anglicised, added missing models
TGyAkos Oct 22, 2024
f0ca9b2
Merge pull request #49 from Pollak-Projects/Backend/AdminModel-fix
IWillSettYou Oct 22, 2024
a839a11
Create sonar-project.properties
TGyAkos Oct 27, 2024
dd79a3a
Create build.yml
TGyAkos Oct 27, 2024
cfdab1e
Update build.yml
TGyAkos Oct 27, 2024
255fec0
flake: added openssl
nezsha Oct 27, 2024
c82b72a
flake: adde prisma stuff
nezsha Oct 27, 2024
53c3ca2
frontend: #39, added 404 page
nezsha Oct 27, 2024
a879d63
Navigation now works in the admin page and sub-pages
IWillSettYou Oct 21, 2024
ac0601c
updated .env.example
TGyAkos Oct 28, 2024
886cf47
resolved router conflict
TGyAkos Oct 28, 2024
0e0ece9
updated schema.prisma docs
TGyAkos Oct 28, 2024
e22cadb
added authMiddleware
OHOKs Oct 28, 2024
786287e
Merge branch 'SharedBackend' of https://github.com/Pollak-Projects/SZ…
OHOKs Oct 28, 2024
ceb39a6
Merge pull request #51 from Pollak-Projects/SharedBackend
OHOKs Oct 28, 2024
f35a34d
Removed the useless Evf string
OHOKs Nov 2, 2024
c25039c
Add files via upload
OHOKs Nov 3, 2024
bcbd253
Merged the pages manually
OHOKs Nov 3, 2024
4213bf4
update design
Adklps Nov 4, 2024
7bb77bd
list update 2
Adklps Nov 4, 2024
8160175
Merge pull request #63 from Pollak-Projects/list-update
Adklps Nov 4, 2024
04dda20
Update AdminModules.vue
dominik1312 Nov 5, 2024
ad7acb6
style fixed
csanszy Nov 5, 2024
58361ca
style fixed
csanszy Nov 5, 2024
b64ea22
admin page fixed
csanszy Nov 5, 2024
a154c14
cards fixed
csanszy Nov 5, 2024
bf1ade6
home page fixed
csanszy Nov 5, 2024
9bc33d3
Update README.md
csanszy Nov 5, 2024
e29eaf5
Update AdminAssignments.vue
IWillSettYou Nov 5, 2024
257e5f7
Update AdminModules.vue
IWillSettYou Nov 5, 2024
07cc624
Update AdminUsers.vue
IWillSettYou Nov 5, 2024
56d3391
Update Admin.vue
IWillSettYou Nov 5, 2024
f6e7d82
Fixed navigation
IWillSettYou Nov 5, 2024
a555635
Refactor
OHOKs Nov 5, 2024
8327f38
Refactored
OHOKs Nov 5, 2024
6739792
Update schema.prisma
OHOKs Nov 5, 2024
65777df
Update README.md
csanszy Nov 5, 2024
51cd568
Create .gitignore
TGyAkos Nov 5, 2024
33124f5
Update README.md
csanszy Nov 5, 2024
75bf143
Add files via upload
csanszy Nov 5, 2024
67373c6
Update README.md
OHOKs Nov 5, 2024
e2329a2
Update README.md
csanszy Nov 5, 2024
3ff295b
+ Changes
iambestaim Nov 5, 2024
5f7346d
+ changes
iambestaim Nov 5, 2024
490e043
added clickAt function to listing
OHOKs Nov 5, 2024
c6cbf4a
Merge branch 'dev' into development/LandingPage
OHOKs Nov 5, 2024
0d39433
endpoint docs
TGyAkos Nov 5, 2024
42126e5
fixed env example
TGyAkos Nov 5, 2024
ba041c9
finally fixed schema.prisma
TGyAkos Nov 5, 2024
878912a
updated prisma
TGyAkos Nov 5, 2024
e09f8f4
updated subject endpoints to use the new database
TGyAkos Nov 5, 2024
b489074
Új funkciók
MrGaben Nov 6, 2024
75f7caa
Új funkciók
MrGaben Nov 6, 2024
1ca7b24
Merge pull request #65 from Pollak-Projects/random/Nyíltnap
TGyAkos Nov 7, 2024
2217b42
Update View.vue
MrGaben Nov 7, 2024
262bb3f
Idk what is this
MrGaben Nov 7, 2024
15c2a2d
idk what is this
MrGaben Nov 7, 2024
6478147
Merge branch 'development/ViewPage' of https://github.com/Pollak-Proj…
MrGaben Nov 7, 2024
ec1ca72
login fixed
csanszy Nov 11, 2024
1c72459
login fixed
bedi-xd Nov 11, 2024
2f57b2f
ticsör
Adklps Nov 11, 2024
d002e91
made it RESPONSIVE🤓
Adklps Nov 12, 2024
f379220
Merge pull request #64 from Pollak-Projects/development/LandingPage
OHOKs Nov 12, 2024
c241ec4
Merge branch 'dev' into development/ListPage
OHOKs Nov 12, 2024
8a0fbc0
Merge pull request #67 from Pollak-Projects/development/ListPage
OHOKs Nov 12, 2024
d778cd1
Added isAdmin as global key
IWillSettYou Nov 12, 2024
9b5db35
Add files via upload
MrGaben Nov 12, 2024
545352e
Add files via upload
MrGaben Nov 12, 2024
ebc0c7c
Merge pull request #68 from Pollak-Projects/development/AdminPage
OHOKs Nov 12, 2024
eb99907
Merge pull request #69 from Pollak-Projects/development/ViewPage
OHOKs Nov 12, 2024
f78a998
login almost fixed (csan gonna fix it)
OHOKs Nov 12, 2024
26d1a60
started adding carets to dropdowns
TGyAkos Nov 12, 2024
62a29de
Refactored the modules file system, but someone fucked up something w…
IWillSettYou Nov 12, 2024
49f24ae
Merge remote-tracking branch 'origin/development/AdminPage' into deve…
IWillSettYou Nov 12, 2024
a68ed5c
login submit fixed
bedi-xd Nov 13, 2024
8a041a3
Done with the Listing and Creation on All the admin pages, but only w…
IWillSettYou Nov 13, 2024
e043f0d
Update Login.vue
csanszy Nov 13, 2024
c731060
Merge pull request #70 from Pollak-Projects/development/AdminPage
IWillSettYou Nov 14, 2024
57a7e27
Added CI/CD build
adrianhuszka Nov 14, 2024
f1ebe1f
Fixed needs names
adrianhuszka Nov 14, 2024
87010a7
asd
adrianhuszka Nov 14, 2024
f6bdcb2
Fixed uppercase
adrianhuszka Nov 14, 2024
d7d85b5
Paths
adrianhuszka Nov 14, 2024
470f4cd
asd
adrianhuszka Nov 14, 2024
93e18d5
a
adrianhuszka Nov 14, 2024
80e5eba
Hopefully fixed docker build inconsistencies
TGyAkos Nov 14, 2024
0882cf4
bruh
TGyAkos Nov 14, 2024
5a77d5f
hopefully second time
TGyAkos Nov 14, 2024
d84eeea
hopefully third time
TGyAkos Nov 14, 2024
2d501f4
hopefully fourth time
TGyAkos Nov 14, 2024
475a695
hopefully fifth time
TGyAkos Nov 14, 2024
e87fbd2
hopefully sixth time
TGyAkos Nov 14, 2024
d85ddbf
hopefully seventh time
TGyAkos Nov 14, 2024
c11331b
hopefully eight time
TGyAkos Nov 14, 2024
a17e1db
hopefully ninth time
TGyAkos Nov 14, 2024
28fbf81
hopefully tenth time
TGyAkos Nov 14, 2024
e3b7e48
it works, just did some cleanup
TGyAkos Nov 14, 2024
74e270b
finally got primevue working
TGyAkos Nov 15, 2024
a56b39d
added missing primevue packages, that aren't added by default for som…
TGyAkos Nov 15, 2024
483fedf
started adding fileupload
TGyAkos Nov 15, 2024
c0401ed
ticsör
Adklps Nov 11, 2024
74555d7
made it RESPONSIVE🤓
Adklps Nov 12, 2024
59d35fe
Update README.md
csanszy Nov 5, 2024
d281f9a
Update README.md
OHOKs Nov 5, 2024
0063591
Update README.md
csanszy Nov 5, 2024
3311aa0
endpoint docs
TGyAkos Nov 5, 2024
e5ee051
fixed env example
TGyAkos Nov 5, 2024
fddd585
finally fixed schema.prisma
TGyAkos Nov 5, 2024
ea500c7
updated prisma
TGyAkos Nov 5, 2024
28acd79
updated subject endpoints to use the new database
TGyAkos Nov 5, 2024
a4a4cd9
login fixed
bedi-xd Nov 11, 2024
247f21a
Add files via upload
csanszy Nov 5, 2024
bab1c34
added clickAt function to listing
OHOKs Nov 5, 2024
2aaadac
login fixed
csanszy Nov 11, 2024
6e377e0
+ Changes
iambestaim Nov 5, 2024
525be1e
+ changes
iambestaim Nov 5, 2024
a15cd29
idk what is this
MrGaben Nov 7, 2024
c154648
Új funkciók
MrGaben Nov 6, 2024
03922e9
Új funkciók
MrGaben Nov 6, 2024
60f95d1
Update View.vue
MrGaben Nov 7, 2024
ad0ac9f
Idk what is this
MrGaben Nov 7, 2024
870adcb
Add files via upload
MrGaben Nov 12, 2024
e094049
Add files via upload
MrGaben Nov 12, 2024
13487c0
Added CI/CD build
adrianhuszka Nov 14, 2024
23eaff7
Fixed needs names
adrianhuszka Nov 14, 2024
70e29c4
asd
adrianhuszka Nov 14, 2024
04920e2
Fixed uppercase
adrianhuszka Nov 14, 2024
87da3e6
Paths
adrianhuszka Nov 14, 2024
0be643f
asd
adrianhuszka Nov 14, 2024
8613169
a
adrianhuszka Nov 14, 2024
ab910a6
Hopefully fixed docker build inconsistencies
TGyAkos Nov 14, 2024
198673b
bruh
TGyAkos Nov 14, 2024
24ba2e0
hopefully second time
TGyAkos Nov 14, 2024
f70d19f
hopefully third time
TGyAkos Nov 14, 2024
3bcfa64
hopefully fourth time
TGyAkos Nov 14, 2024
cc06ea6
hopefully fifth time
TGyAkos Nov 14, 2024
a1bfc37
hopefully sixth time
TGyAkos Nov 14, 2024
9a3e939
hopefully seventh time
TGyAkos Nov 14, 2024
86c5507
hopefully eight time
TGyAkos Nov 14, 2024
7d7c45b
hopefully ninth time
TGyAkos Nov 14, 2024
c468e83
hopefully tenth time
TGyAkos Nov 14, 2024
c9bd2f0
it works, just did some cleanup
TGyAkos Nov 14, 2024
c94c989
Merge remote-tracking branch 'origin/dev' into development/AdminPage
TGyAkos Nov 15, 2024
a673cfc
updated/added endpoints according to schema
TGyAkos Nov 15, 2024
fdd7019
Added dynamic list
OHOKs Nov 15, 2024
4a429e5
Merge branch 'development/AdminPage' of https://github.com/Pollak-Pro…
OHOKs Nov 15, 2024
7515e8d
added Assignment schema end endpoints
TGyAkos Nov 15, 2024
757b3fb
refactored to composition
TGyAkos Nov 15, 2024
9819e83
added get/delete endpoint usages in Admin
TGyAkos Nov 15, 2024
c3ed8e9
added dynamic dropdown for modules page
OHOKs Nov 15, 2024
c17eb7e
added byId endpoints
TGyAkos Nov 15, 2024
aa90016
added dynamic dropdowns to assignment page
OHOKs Nov 15, 2024
ca28217
Merge branch 'development/AdminPage' of https://github.com/Pollak-Pro…
OHOKs Nov 15, 2024
f796c9f
updated env example
TGyAkos Nov 15, 2024
4a80e58
fixed user create page
OHOKs Nov 15, 2024
cfd2f7f
Merge branch 'development/AdminPage' of https://github.com/Pollak-Pro…
OHOKs Nov 15, 2024
d957395
changed ValidateParseMiddleware.ts added, now all DELETE endpoint are…
TGyAkos Nov 15, 2024
9b5df8d
changed to use params to delete
TGyAkos Nov 15, 2024
8825161
added user registration, added endpoints
TGyAkos Nov 15, 2024
1d064a7
added cors
TGyAkos Nov 15, 2024
0f44858
fixed create endpoints returning the request data
TGyAkos Nov 15, 2024
516fbb7
added pinia to package.json
OHOKs Nov 17, 2024
7b95e7e
Delete CourseController/src/Views/AdminPage/Admin.vue
OHOKs Nov 17, 2024
1ec8b74
Delete CourseController/src/Views/AdminPage/AdminModules.vue
OHOKs Nov 17, 2024
c7c3324
Delete CourseController/src/Components/AdminComponents/AdminNavbar.vue
OHOKs Nov 17, 2024
18cce5d
Merge branch 'development/LandingPage' of https://github.com/Pollak-P…
OHOKs Nov 17, 2024
0886014
Merge pull request #71 from Pollak-Projects/development/AdminPage
OHOKs Nov 17, 2024
a324f54
Update Login.vue
csanszy Nov 18, 2024
19555c5
Update Login.vue
csanszy Nov 18, 2024
841b64a
Merge pull request #74 from Pollak-Projects/development/AdminPage
OHOKs Nov 18, 2024
e30bb1b
Merge pull request #75 from Pollak-Projects/development/LandingPage
OHOKs Nov 18, 2024
3f7f5ac
Update schema.prisma
OHOKs Nov 18, 2024
3eb6b61
Update schema.prisma
OHOKs Nov 18, 2024
a901ce2
Merge pull request #77 from Pollak-Projects/development/AdminPage
OHOKs Nov 18, 2024
d548d2d
Update LandingPage.vue
dominik1312 Nov 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 105 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: Build

on:
workflow_dispatch:
push:
branches:
- dev


jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- uses: sonarsource/sonarqube-scan-action@v3
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
# If you wish to fail your job when the Quality Gate is red, uncomment the
# following lines. This would typically be used to fail a deployment.
# - uses: sonarsource/sonarqube-quality-gate-action@master
# timeout-minutes: 5
# env:
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
build-frontend:
name: Build Frontend Docker Image 🏗️
runs-on: ubuntu-latest

steps:
- name: Check out repository code 🛎️
uses: actions/checkout@v4
with:
sparse-checkout: CourseController

- name: Set up QEMU 🐳
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx 🚀
uses: docker/setup-buildx-action@v3

- name: Login to Registry 🚢
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push 🏗️
uses: docker/build-push-action@v2
with:
context: ./CourseController
platforms: linux/amd64
file: ./CourseController/Dockerfile
push: true
tags: ghcr.io/pollak-projects/szf1_13_frontend_coursecontroller/app:latest
cache-from: type=gha
cache-to: type=gha,mode=max

build-backend:
name: Build Backend Docker Image 🏗️
runs-on: ubuntu-latest

steps:
- name: Check out repository code 🛎️
uses: actions/checkout@v4
with:
sparse-checkout: server

- name: Set up QEMU 🐳
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx 🚀
uses: docker/setup-buildx-action@v3

- name: Login to Registry 🚢
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push 🏗️
uses: docker/build-push-action@v2
with:
context: ./server
platforms: linux/amd64
file: ./server/Dockerfile
push: true
tags: ghcr.io/pollak-projects/szf1_13_frontend_coursecontroller/api:latest
cache-from: type=gha
cache-to: type=gha,mode=max

triggerUpdate:
name: Trigger Update 🔄
runs-on: ubuntu-latest
needs: [build-backend, build-frontend]
steps:
- name: Call Webhook
uses: distributhor/workflow-webhook@v3
with:
webhook_url: ${{ secrets.WEBHOOK_URL }}
1 change: 1 addition & 0 deletions CourseController/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_URL=http://localhost:3300
1 change: 1 addition & 0 deletions CourseController/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ node_modules
dist
dist-ssr
*.local
.env

# Editor directories and files
.vscode/*
Expand Down
3 changes: 0 additions & 3 deletions CourseController/.vscode/extensions.json

This file was deleted.

34 changes: 34 additions & 0 deletions CourseController/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# it's a good idea to pin this, but for demo purposes we'll leave it as is
FROM node:latest as builder

# automatically creates the dir and sets it as the current working dir
WORKDIR /usr/src/app
# this will allow us to run vite and other tools directly
ENV PATH /usr/src/node_modules/.bin:$PATH

# inject all environment vars we'll need
ARG VITE_BACKEND_URL
# expose the variable to the finished cotainer
ENV VITE_BACKEND_URL=$VITE_BACKEND_URL

COPY ./package.json ./

RUN npm install

# use a more specific COPY, as this will include files like `Dockerfile`, we don't really need inside our containers.
COPY ./ ./

FROM builder as dev
CMD ["npm", "run", "dev"]

FROM builder as prod-builder
RUN npm run build

# it's a good idea to pin this, but for demo purposes we'll leave it as is
FROM nginx:latest as prod

COPY --from=prod-builder /usr/src/app/dist /usr/share/nginx/html

COPY ./config/nginx.conf /etc/nginx/conf.d/default.conf

CMD ["nginx", "-g", "daemon off;"]
1 change: 1 addition & 0 deletions CourseController/SZF1_13_Frontend_CourseController
Submodule SZF1_13_Frontend_CourseController added at eb9990
11 changes: 7 additions & 4 deletions CourseController/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ export {}
/* prettier-ignore */
declare module 'vue' {
export interface GlobalComponents {
AdminModule: typeof import('./src/components/AdminModule.vue')['default']
AdminNavbar: typeof import('./src/components/AdminNavbar.vue')['default']
AdminModule: typeof import('./src/components/AdminComponents/AdminModule.vue')['default']
AdminNavbar: typeof import('./src/components/AdminComponents/AdminNavbar.vue')['default']
Button: typeof import('primevue/button')['default']
Toast: typeof import('primevue/toast')['default']
Feladatsor: typeof import('./src/components/ViewComponents/Feladatsor.vue')['default']
Menu: typeof import('primevue/menu')['default']
Navigation: typeof import('./src/components/Navigation.vue')['default']
Navigation: typeof import('./src/components/NavigationComponents/Navigation.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
UserIcon: typeof import('./src/components/UserIcon.vue')['default']
UserIcon: typeof import('./src/components/NavigationComponents/UserIcon.vue')['default']
View: typeof import('./src/components/ViewComponents/View.vue')['default']
}
}
9 changes: 9 additions & 0 deletions CourseController/config/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
server {
listen 80;

location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}
}
Loading
Loading