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.

Sign up for GitHub

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 1/17 2 #151

Merged
merged 6 commits into from
Jan 18, 2024
Merged

Merge 1/17 2 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2970fe
update LoginView
tsungchiehchen Jan 18, 2024
1566b0f
change domain name to tobywinz
tsungchiehchen Jan 18, 2024
9003802
Update backend URL
tobyyu007 Jan 18, 2024
434d125
Update LoginView.vue
hango880623 Jan 18, 2024
5868bf4
Merge branch 'Merge-1/17-2' into login_mod
hango880623 Jan 18, 2024
a505f58
Add Login modification
hango880623 Jan 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
6 changes: 3 additions & 3 deletions frontend/dist/assets/index-88509652.js
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions frontend/src/composables/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export function useData() {
// const jProfile = await _loadJson('./data/info/profile.json')

_jsonData.places = jPlaces
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -188,7 +188,7 @@ export function useData() {
if(utils.isStringAJSONUrl(jsonPath)) {
var jD;
if (jsonPath.includes("skills")){
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -203,7 +203,7 @@ export function useData() {
}

else if (jsonPath.includes("cover")){
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -218,7 +218,7 @@ export function useData() {
}

else if (jsonPath.includes("profile")){
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -234,7 +234,7 @@ export function useData() {


else if (jsonPath.includes("education")){
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -249,7 +249,7 @@ export function useData() {
}

else if (jsonPath.includes("experience")){
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -264,7 +264,7 @@ export function useData() {
}

else if (jsonPath.includes("achievements")){
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/router/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export function createAppRouter() {
let isAuthenticated = false

try {
const response = await fetch("https://res-a-me-api.tobywinz.com/loadUser", {
const response = await fetch("https://res-a-me-api.resilientdb.com/loadUser", {
method: "GET",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -74,7 +74,7 @@ export function createAppRouter() {
if (json.status === 200) {
isAuthenticated = true;
} else if (json.msg === "Token has expired") {
const refreshResponse = await fetch("https://res-a-me-api.tobywinz.com/refresh", {
const refreshResponse = await fetch("https://res-a-me-api.resilientdb.com/refresh", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down
30 changes: 15 additions & 15 deletions frontend/src/vue/core/Editview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default {
//skill data
// const skill_response = await axios.get('../../../data/sections/skills.json');
// const skill_data = skill_response.data;
const skill_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const skill_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -133,7 +133,7 @@ export default {
//about data
// const cover_response = await axios.get('../../../data/sections/cover.json');
// const cover_data = cover_response.data;
const cover_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const cover_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -144,7 +144,7 @@ export default {
});
const cover_data = await cover_response.json();
cover_data_old.value = cover_data; //for update JSON file
const profile_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const profile_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -171,7 +171,7 @@ export default {
//education data
// const edu_response = await axios.get('../../../data/sections/education.json');
// const edu_data = edu_response.data;
const edu_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const edu_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -196,7 +196,7 @@ export default {
//profession data
// const pro_response = await axios.get('../../../data/sections/experience.json');
// const pro_data = pro_response.data;
const pro_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const pro_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -221,7 +221,7 @@ export default {
//achievement and award data
// const achi_response = await axios.get('../../../data/sections/achievements.json');
// const achi_data = achi_response.data;
const achi_response = await fetch("https://res-a-me-api.tobywinz.com/loadResume", {
const achi_response = await fetch("https://res-a-me-api.resilientdb.com/loadResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -276,7 +276,7 @@ export default {
let userEmail = "";

try {
const response = await fetch("https://res-a-me-api.tobywinz.com/loadUser", {
const response = await fetch("https://res-a-me-api.resilientdb.com/loadUser", {
method: "GET",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -292,7 +292,7 @@ export default {
}

try {
const response = await fetch("https://res-a-me-api.tobywinz.com/updateResume", {
const response = await fetch("https://res-a-me-api.resilientdb.com/updateResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -346,7 +346,7 @@ export default {
}
});
}
fetch("https://res-a-me-api.tobywinz.com/editResume", {
fetch("https://res-a-me-api.resilientdb.com/editResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -365,7 +365,7 @@ export default {
this.profile_data_old.locales.en.role = this.about.role;
this.profile_data_old.contact.email.value = this.about.email;
this.profile_data_old.contact.phone.valueShort = this.about.phone;
await fetch("https://res-a-me-api.tobywinz.com/editResume", {
await fetch("https://res-a-me-api.resilientdb.com/editResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand All @@ -374,7 +374,7 @@ export default {
},
body: JSON.stringify({ "category": "cover", "data": JSON.stringify(this.cover_data_old) }),
});
await fetch("https://res-a-me-api.tobywinz.com/editResume", {
await fetch("https://res-a-me-api.resilientdb.com/editResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -418,7 +418,7 @@ export default {
},
});
}
fetch("https://res-a-me-api.tobywinz.com/editResume", {
fetch("https://res-a-me-api.resilientdb.com/editResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -462,7 +462,7 @@ export default {
},
});
}
fetch("https://res-a-me-api.tobywinz.com/editResume", {
fetch("https://res-a-me-api.resilientdb.com/editResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -506,7 +506,7 @@ export default {
},
});
}
await fetch("https://res-a-me-api.tobywinz.com/editResume", {
await fetch("https://res-a-me-api.resilientdb.com/editResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -550,7 +550,7 @@ export default {
},
});
}
await fetch("https://res-a-me-api.tobywinz.com/editResume", {
await fetch("https://res-a-me-api.resilientdb.com/editResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down
20 changes: 10 additions & 10 deletions frontend/src/vue/core/LandingPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export default {
document.getElementById("logoutButton").style.display = "none";
document.getElementById("userNameDisplay").style.display = "none";

await fetch("https://res-a-me-api.tobywinz.com/loadUser", {
await fetch("https://res-a-me-api.resilientdb.com/loadUser", {
// Check if user is logged in
method: "GET",
headers: {
Expand All @@ -184,10 +184,10 @@ export default {
if (json.status === 200) {
// User is logged in
this.userEmail = json.logged_in_as;
fetch(`https://res-a-me-api.tobywinz.com/static/images/${this.userEmail}.png`)
fetch(`https://res-a-me-api.resilientdb.com/static/images/${this.userEmail}.png`)
.then(response => {
if(response.ok) {
this.shortCutIcon = `https://res-a-me-api.tobywinz.com/static/images/${this.userEmail}.png`;
this.shortCutIcon = `https://res-a-me-api.resilientdb.com/static/images/${this.userEmail}.png`;
} else {
this.shortCutIcon = `/images/pictures/avatar.png`;
}
Expand All @@ -205,7 +205,7 @@ export default {
error.message || "An error occurred. Please try again.";
});

fetch("https://res-a-me-api.tobywinz.com/userList", {
fetch("https://res-a-me-api.resilientdb.com/userList", {
// Get the user list for the search bar
method: "GET",
headers: {
Expand All @@ -220,10 +220,10 @@ export default {
document.getElementById("userNameDisplay").style.display = "block";
}
var avatar = "";
fetch(`https://res-a-me-api.tobywinz.com/static/images/${json.user_list[index].email}.png`)
fetch(`https://res-a-me-api.resilientdb.com/static/images/${json.user_list[index].email}.png`)
.then(response => {
if(response.ok) {
avatar = `https://res-a-me-api.tobywinz.com/static/images/${json.user_list[index].email}.png`;
avatar = `https://res-a-me-api.resilientdb.com/static/images/${json.user_list[index].email}.png`;
} else {
avatar = `/images/pictures/avatar.png`;
}
Expand All @@ -243,7 +243,7 @@ export default {
methods: {
logout() {
const errorMessage = "";
fetch("https://res-a-me-api.tobywinz.com/logout", {
fetch("https://res-a-me-api.resilientdb.com/logout", {
method: "GET",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -278,7 +278,7 @@ export default {
},
async profileShortcutAction(){
try {
const response = await fetch("https://res-a-me-api.tobywinz.com/updateResume", {
const response = await fetch("https://res-a-me-api.resilientdb.com/updateResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -311,7 +311,7 @@ export default {
}

try {
const response = await fetch("https://res-a-me-api.tobywinz.com/updateResume", {
const response = await fetch("https://res-a-me-api.resilientdb.com/updateResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down Expand Up @@ -347,7 +347,7 @@ export default {
}

try {
const response = await fetch("https://res-a-me-api.tobywinz.com/updateResume", {
const response = await fetch("https://res-a-me-api.resilientdb.com/updateResume", {
method: "POST",
headers: {
"Content-type": "application/json; charset=UTF-8",
Expand Down
Loading