Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest changes into main #57

Merged
merged 36 commits into from
Mar 4, 2024
Merged
Changes from 3 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
58d4c43
Added integration with s6 backend (yet to be tested)
gyuudon3187 Feb 16, 2024
5d57099
Validation for login
hannesmann Feb 20, 2024
9f638df
Merge pull request #46 from IV1201-Group-2/feature/login-validation
hannesmann Feb 20, 2024
cb97e65
Fix formatting
hannesmann Feb 20, 2024
c86f492
Merge branch 'develop' into feature/integrating-with-s6-backend
gyuudon3187 Feb 20, 2024
176f2b5
Ongoing progress of s6 (and s5, despite the branch name!) integration
gyuudon3187 Feb 20, 2024
9a3bb20
Changed fetch method from POST to GET
gyuudon3187 Feb 20, 2024
dafba53
Fix login after sign up
hannesmann Feb 21, 2024
d10b5e1
Merge pull request #47 from IV1201-Group-2/bugfix/login-after-register
hannesmann Feb 21, 2024
7444d71
Huge commit incoming. Has: 1) integration of s5 and s6 backend, 2) ge…
gyuudon3187 Feb 21, 2024
637d765
Ran prettier formatting & changed things that the linter complained on
gyuudon3187 Feb 21, 2024
49e59ba
Merge branch 'develop' into feature/integrating-with-s6-backend
gyuudon3187 Feb 21, 2024
a94a4d2
Merge pull request #48 from IV1201-Group-2/feature/integrating-with-s…
gyuudon3187 Feb 21, 2024
53d5717
Fixing i18n key for message shown when applying twice
gyuudon3187 Feb 21, 2024
73a6be8
Merge pull request #49 from IV1201-Group-2/hotfix/correcting-already-…
gyuudon3187 Feb 21, 2024
54140cb
Added comments to exported interfaces and functions
gyuudon3187 Feb 22, 2024
105df33
Removed unnecessary files
gyuudon3187 Feb 22, 2024
3e59287
Removed unnecessary store
gyuudon3187 Feb 22, 2024
e5ea863
Removed unnecessary view
gyuudon3187 Feb 22, 2024
e2ffe9e
Potentially fixed the no redirection to root issue
gyuudon3187 Feb 27, 2024
e8708af
Ran prettier formatting
gyuudon3187 Feb 27, 2024
30c388f
Merge pull request #50 from IV1201-Group-2/bugfix/generic-redirect-to…
gyuudon3187 Feb 27, 2024
77dceb7
Added logging
gyuudon3187 Feb 28, 2024
b35b886
Merge pull request #51 from IV1201-Group-2/feature/logging
gyuudon3187 Feb 28, 2024
095a07b
Replace password reset with link
hannesmann Mar 1, 2024
69d3d52
Add password-reset route
hannesmann Mar 1, 2024
dc45b83
Use hash router
hannesmann Mar 1, 2024
dc59d1c
Merge pull request #52 from IV1201-Group-2/feature/password-reset
hannesmann Mar 1, 2024
96750a0
Added warning & error logging and removed logging ServerController to…
gyuudon3187 Mar 2, 2024
cb3807c
Merge pull request #53 from IV1201-Group-2/feature/logging-with-warni…
gyuudon3187 Mar 2, 2024
db31b46
Potential fix to the sorting bug
gyuudon3187 Mar 2, 2024
1cab166
Merge pull request #54 from IV1201-Group-2/bugfix/admin-panel-sorting…
gyuudon3187 Mar 2, 2024
0d1cada
Revert "Use hash router"
hannesmann Mar 4, 2024
3b981e9
Serve index.html on all paths in client-service
hannesmann Mar 4, 2024
2154e48
Merge pull request #55 from IV1201-Group-2/bugfix/router
hannesmann Mar 4, 2024
3f3cac8
Merge pull request #56 from IV1201-Group-2/master
hannesmann Mar 4, 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
Original file line number Diff line number Diff line change
@@ -8,14 +8,9 @@
@Slf4j
@Controller
public class ServerController {
@GetMapping("")
@GetMapping("/{path:[^\\.]*}")
public String acceptConnection(HttpServletRequest request) {
log.info("Application requested by {}", request.getRemoteAddr());
log.info("{} requested by {}", request.getRequestURI(), request.getRemoteAddr());
return "index.html";
}

@RequestMapping(value = "/{path:[^\\.]*}")
public String redirect() {
return "forward:/";
}
}
4 changes: 2 additions & 2 deletions src/router/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createRouter, createWebHashHistory } from "vue-router";
import { createRouter, createWebHistory } from "vue-router";
import LoginView from "@/views/applicant/ApplicantLoginView.vue";
import ApplicantRegistrationView from "@/views/applicant/ApplicantRegistrationView.vue";
import ApplicationFormView from "@/views/applicant/ApplicationFormView.vue";
@@ -9,7 +9,7 @@ import HandleApplication from "@/views/recruiter/HandleApplication.vue";
import ApplicantPasswordResetView from "@/views/applicant/ApplicantPasswordResetView.vue";

const router = createRouter({
history: createWebHashHistory(import.meta.env.BASE_URL),
history: createWebHistory(import.meta.env.BASE_URL),
routes: [
{
path: "/",
2 changes: 1 addition & 1 deletion src/stores/auth.ts
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ export const useAuthStore = defineStore("auth", () => {
return RESTError.None;
} else {
if (jsonResponse.error === RESTError.MissingPassword) {
resetLink.value = window.location.origin + "/#/password-reset?token=" + jsonResponse.details.reset_token;
resetLink.value = window.location.origin + "/password-reset?token=" + jsonResponse.details.reset_token;
}
return jsonResponse.error as RESTError;
}