From e56a78bd755a7008338b68930f013dda56ab1117 Mon Sep 17 00:00:00 2001 From: Elmar Kresse <18119527+masterElmar@users.noreply.github.com> Date: Wed, 20 Sep 2023 12:00:51 +0200 Subject: [PATCH] update paths and ical link url --- backend/go.mod | 2 +- backend/main.go | 4 +- backend/service/addRoute.go | 18 +- backend/service/db/dbEvents.go | 2 +- backend/service/db/dbFeeds.go | 2 +- backend/service/db/dbGroups.go | 2 +- backend/service/events/courseService.go | 2 +- backend/service/events/eventService.go | 2 +- .../service/fetch/fetchSeminarEventService.go | 6 +- .../service/fetch/fetchSeminarGroupService.go | 4 +- backend/service/ical/ical.go | 4 +- backend/service/room/roomService.go | 2 +- frontend/README.md | 2 +- frontend/package-lock.json | 4 +- frontend/package.json | 2 +- frontend/public/Browse.plb | Bin 810 -> 0 bytes frontend/src/components/CalendarLink.vue | 6 +- frontend/src/components/CourseSelection.vue | 2 +- frontend/src/components/FaqPage.vue | 171 +++++++++++++++++- frontend/src/components/Impress.vue | 37 +++- frontend/src/components/ModuleSelection.vue | 2 +- frontend/src/components/PrivacyPolicy.vue | 98 +++++++++- frontend/src/main.ts | 4 + 23 files changed, 336 insertions(+), 42 deletions(-) delete mode 100644 frontend/public/Browse.plb diff --git a/backend/go.mod b/backend/go.mod index 9c711da..745d3be 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -1,4 +1,4 @@ -module htwk-planner +module htwkalender go 1.20 diff --git a/backend/main.go b/backend/main.go index fec7f0d..5e170be 100644 --- a/backend/main.go +++ b/backend/main.go @@ -3,8 +3,8 @@ package main import ( "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/plugins/migratecmd" - _ "htwk-planner/migrations" - "htwk-planner/service" + _ "htwkalender/migrations" + "htwkalender/service" "log" "os" "strings" diff --git a/backend/service/addRoute.go b/backend/service/addRoute.go index 94c0281..4560144 100644 --- a/backend/service/addRoute.go +++ b/backend/service/addRoute.go @@ -5,10 +5,10 @@ import ( "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/apis" "github.com/pocketbase/pocketbase/core" - events2 "htwk-planner/service/events" - fetch2 "htwk-planner/service/fetch" - "htwk-planner/service/ical" - "htwk-planner/service/room" + "htwkalender/service/events" + "htwkalender/service/fetch" + "htwkalender/service/ical" + "htwkalender/service/room" "net/http" "os" ) @@ -25,7 +25,7 @@ func AddRoutes(app *pocketbase.PocketBase) { Method: http.MethodGet, Path: "/api/fetchPlans", Handler: func(c echo.Context) error { - return fetch2.GetSeminarEvents(c, app) + return fetch.GetSeminarEvents(c, app) }, Middlewares: []echo.MiddlewareFunc{ apis.ActivityLogger(app), @@ -42,7 +42,7 @@ func AddRoutes(app *pocketbase.PocketBase) { Method: http.MethodGet, Path: "/api/fetchGroups", Handler: func(c echo.Context) error { - return fetch2.SeminarGroups(c, app) + return fetch.SeminarGroups(c, app) }, Middlewares: []echo.MiddlewareFunc{ apis.ActivityLogger(app), @@ -113,7 +113,7 @@ func AddRoutes(app *pocketbase.PocketBase) { Handler: func(c echo.Context) error { course := c.QueryParam("course") semester := c.QueryParam("semester") - return events2.GetModulesForCourseDistinct(app, c, course, semester) + return events.GetModulesForCourseDistinct(app, c, course, semester) }, Middlewares: []echo.MiddlewareFunc{ apis.ActivityLogger(app), @@ -130,7 +130,7 @@ func AddRoutes(app *pocketbase.PocketBase) { Method: http.MethodGet, Path: "/api/modules", Handler: func(c echo.Context) error { - return events2.GetAllModulesDistinct(app, c) + return events.GetAllModulesDistinct(app, c) }, Middlewares: []echo.MiddlewareFunc{ apis.ActivityLogger(app), @@ -147,7 +147,7 @@ func AddRoutes(app *pocketbase.PocketBase) { Method: http.MethodGet, Path: "/api/courses", Handler: func(c echo.Context) error { - return events2.GetAllCourses(app, c) + return events.GetAllCourses(app, c) }, Middlewares: []echo.MiddlewareFunc{ apis.ActivityLogger(app), diff --git a/backend/service/db/dbEvents.go b/backend/service/db/dbEvents.go index bd83640..2f7eb5a 100644 --- a/backend/service/db/dbEvents.go +++ b/backend/service/db/dbEvents.go @@ -5,7 +5,7 @@ import ( "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/models" - "htwk-planner/model" + "htwkalender/model" "log" "strings" "time" diff --git a/backend/service/db/dbFeeds.go b/backend/service/db/dbFeeds.go index 09227e4..b8109a3 100644 --- a/backend/service/db/dbFeeds.go +++ b/backend/service/db/dbFeeds.go @@ -4,7 +4,7 @@ import ( "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/models" - "htwk-planner/model" + "htwkalender/model" ) func SaveFeed(feed model.Feed, collection *models.Collection, app *pocketbase.PocketBase) (*models.Record, error) { diff --git a/backend/service/db/dbGroups.go b/backend/service/db/dbGroups.go index f09c891..5714f88 100644 --- a/backend/service/db/dbGroups.go +++ b/backend/service/db/dbGroups.go @@ -4,7 +4,7 @@ import ( "github.com/pocketbase/dbx" "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/models" - "htwk-planner/model" + "htwkalender/model" ) func SaveGroups(seminarGroup []model.SeminarGroup, collection *models.Collection, app *pocketbase.PocketBase) ([]*models.Record, error) { diff --git a/backend/service/events/courseService.go b/backend/service/events/courseService.go index 00e849d..daf9f09 100644 --- a/backend/service/events/courseService.go +++ b/backend/service/events/courseService.go @@ -3,7 +3,7 @@ package events import ( "github.com/labstack/echo/v5" "github.com/pocketbase/pocketbase" - "htwk-planner/service/db" + "htwkalender/service/db" ) func GetAllCourses(app *pocketbase.PocketBase, c echo.Context) error { diff --git a/backend/service/events/eventService.go b/backend/service/events/eventService.go index 057e9a7..e2fcbd8 100644 --- a/backend/service/events/eventService.go +++ b/backend/service/events/eventService.go @@ -3,7 +3,7 @@ package events import ( "github.com/labstack/echo/v5" "github.com/pocketbase/pocketbase" - "htwk-planner/service/db" + "htwkalender/service/db" "unicode" ) diff --git a/backend/service/fetch/fetchSeminarEventService.go b/backend/service/fetch/fetchSeminarEventService.go index 6c0569e..ca00a32 100644 --- a/backend/service/fetch/fetchSeminarEventService.go +++ b/backend/service/fetch/fetchSeminarEventService.go @@ -6,9 +6,9 @@ import ( "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/apis" "golang.org/x/net/html" - "htwk-planner/model" - "htwk-planner/service/date" - "htwk-planner/service/db" + "htwkalender/model" + "htwkalender/service/date" + "htwkalender/service/db" "io" "net/http" "regexp" diff --git a/backend/service/fetch/fetchSeminarGroupService.go b/backend/service/fetch/fetchSeminarGroupService.go index 53a64ee..89c9b72 100644 --- a/backend/service/fetch/fetchSeminarGroupService.go +++ b/backend/service/fetch/fetchSeminarGroupService.go @@ -7,8 +7,8 @@ import ( "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/apis" "github.com/pocketbase/pocketbase/models" - "htwk-planner/model" - "htwk-planner/service/db" + "htwkalender/model" + "htwkalender/service/db" "io" "net/http" ) diff --git a/backend/service/ical/ical.go b/backend/service/ical/ical.go index 132ea2f..1677416 100644 --- a/backend/service/ical/ical.go +++ b/backend/service/ical/ical.go @@ -7,8 +7,8 @@ import ( "github.com/labstack/echo/v5" "github.com/pocketbase/pocketbase" "github.com/pocketbase/pocketbase/apis" - model "htwk-planner/model" - db "htwk-planner/service/db" + model "htwkalender/model" + db "htwkalender/service/db" "io" "net/http" "time" diff --git a/backend/service/room/roomService.go b/backend/service/room/roomService.go index 2cc622c..dd402d2 100644 --- a/backend/service/room/roomService.go +++ b/backend/service/room/roomService.go @@ -3,7 +3,7 @@ package room import ( "github.com/labstack/echo/v5" "github.com/pocketbase/pocketbase" - "htwk-planner/service/db" + "htwkalender/service/db" "net/http" ) diff --git a/frontend/README.md b/frontend/README.md index 66d9079..0810e4a 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -17,4 +17,4 @@ If the standalone TypeScript plugin doesn't feel fast enough to you, Volar has a 2. Find `TypeScript and JavaScript Language Features`, right click and select `Disable (Workspace)` 2. Reload the VSCode window by running `Developer: Reload Window` from the command palette. -# htwk-planner-frontend +# htwkalender-frontend diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 52e7fe7..03310f7 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "htwk-planner", + "name": "htwkalender", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "htwk-planner", + "name": "htwkalender", "version": "0.0.0", "dependencies": { "pinia": "^2.1.6", diff --git a/frontend/package.json b/frontend/package.json index d6829f7..ea0c904 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "htwk-planner", + "name": "htwkalender", "private": true, "version": "0.0.0", "type": "module", diff --git a/frontend/public/Browse.plb b/frontend/public/Browse.plb deleted file mode 100644 index 7b5af2e4d76ecbd0568dc6e4bea27ff590636510..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 810 zcmWH@$S=uP@X5?eRd6cGFE36_%gjk-00L$pW(86#42(b)9}qKv#h8FB0ruw%oIt)X z122O(gCe6bPz}5ndi{ZXQV?VSW)= zDS0_rDH$0B6+LwYB^_lM84Yty9RouX6BBuLOIr&g8$DwaBak7CoSd9I+&mJzyb?x= zGKxkdgZ~E@1UZ0CS72sTVqg+vWEN!ne+1}%pi`l4g}9iForM)Bp(6nFJu5Qi)zsWWDQ0?N+qYLFE>`u~trBXx$&$hCqTV%mnI(1CkF41{QCnjwcD+w;LpQthxjCEz@-NNj)^ff}K*S9sT=xFbTLZrx7Tdvmy6$nedaXTGud`Z|GW9iKMGcQ8sFemtfB*5i*B3m57n z8cp5!@=UbVEd@#2FI_ck_g}fYarZ9S8W zcqV#$JJG@*?Z9+RWU{m0nOU9_jhK&p(*!1}b#fE>Izd*PT(RZzt9esQcExaZHx^8q zyKp17$aT5owZ7idr+Qq-crJU1-J { toast.add({ severity: "info", @@ -25,7 +27,7 @@ function rerouteIfTokenIsEmpty() { } function copyToClipboard() { - const text = "http://localhost:8090/api/feed?token=" + tokenStore().token; + const text = "https://" + domain + "/api/feed?token=" + tokenStore().token; // Copy the text inside the text field navigator.clipboard.writeText(text); show(); @@ -37,7 +39,7 @@ function copyToClipboard() {

- {{ "http://localhost:8090/api/feed?token=" + tokenStore().token }} + {{ "https://" + domain + "/api/feed?token=" + tokenStore().token }}

diff --git a/frontend/src/components/CourseSelection.vue b/frontend/src/components/CourseSelection.vue index f09cabd..a0e284f 100644 --- a/frontend/src/components/CourseSelection.vue +++ b/frontend/src/components/CourseSelection.vue @@ -42,7 +42,7 @@ async function getModules() {