Skip to content
Snippets Groups Projects

Community admin

Merged Community admin
community-admin into main
Merged Erik Borgeteien Hansen requested to merge community-admin into main

Merge request reports

Pipeline #179948 passed

Stage: test

Pipeline passed for 5d31ffdc on community-admin

Approval is optional

Merged by Titus NetlandTitus Netland 2 years ago (May 3, 2022 12:51pm UTC)

Merge details

  • Changes merged into main with b7556483.
  • Deleted the source branch.

Pipeline #180022 passed

Stage: test
Stage: deploy

Pipeline passed for b7556483 on main

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
src/components/BaseComponents/NavBar.vue
53 53 async loadProfile() {
54 54 if (this.$store.state.user.token !== null) {
55 55 let user = parseUserFromToken(this.$store.state.user.token);
56 console.log(user);
56 //console.log(user);
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/BaseComponents/NavBar.vue
    53 53 async loadProfile() {
    54 54 if (this.$store.state.user.token !== null) {
    55 55 let user = parseUserFromToken(this.$store.state.user.token);
    56 console.log(user);
    56 //console.log(user);
    57 57 let id = user.accountId;
    58 console.log(id);
    58 //console.log(id);
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/ChatComponents/ChatMessage.vue
    33 33 },
    34 34 methods: {
    35 35 color() {
    36 console.log(this.userID);
    36 //console.log(this.userID);
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/ChatComponents/ChatProfile.vue
    52 52 },
    53 53 methods: {
    54 54 selectUser() {
    55 console.log(this.conversation.recipient.userId);
    55 //console.log(this.conversation.recipient.userId);
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/CommunityComponents/CommunityHeader.vue
    1 1 <template>
    2 <div class="flex items-center justify-between mx-4">
    2 <!-- TODO PUT A LOADER HERE -->
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/CommunityComponents/CommunityHeader.vue
    80 83 <script>
    81 84 import CommunityHamburger from "@/components/CommunityComponents/CommunityHamburger";
    82 85 import ColoredButton from "@/components/BaseComponents/ColoredButton";
    86 import CommunityService from "@/services/community.service";
    87 import CustomFooterModal from "@/components/BaseComponents/CustomFooterModal";
    88 import { parseCurrentUser } from "@/utils/token-utils";
    83 89 import {
    84 90 JoinOpenCommunity,
    85 GetIfUserAlreadyInCommunity,
    91 // GetIfUserAlreadyInCommunity,
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/CommunityComponents/CommunityHeader.vue
    130 143 },
    131 getIfUserInCommunity: async function () {
    132 try {
    133 this.member = await GetIfUserAlreadyInCommunity(
    134 this.$router.currentRoute.value.params.communityID
    135 );
    136 } catch (error) {
    137 console.log(error);
    138 }
    139 },
    140 144 },
    141 beforeMount() {
    142 this.getIfUserInCommunity();
    145 // beforeMount() {
    146 // this.getIfUserInCommunity();
    147 // },
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/CommunityComponents/CommunityHome.vue
    138 140 this.items = await GetListingsInCommunity(this.communityID);
    139 141 for (var i = 0; i < this.items.length; i++) {
    140 142 let images = await getItemPictures(this.items[i].listingID);
    141 console.log(images);
    143 //console.log(images);
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/CommunityComponents/CommunitySettings.vue 0 → 100644
    8 </div>
    9 </template>
    10
    11 <script>
    12 // import AdminService from "@/services/community-admin.service";
    13 import IconButton from "@/components/BaseComponents/IconButton.vue";
    14
    15 //TODO: OPEN CONFIRMATION DIALOG WHEN DELETING
    16
    17 export default {
    18 components: {
    19 IconButton,
    20 },
    21 methods: {
    22 deleteCommunity() {
    23 //console.log("DELETED");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/FormComponents/LoginForm.vue
    137 137 this.v$.user.$touch();
    138 138
    139 139 if (this.v$.user.$invalid) {
    140 console.log("Ugyldig, avslutter...");
    140 //console.log("Ugyldig, avslutter...");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/FormComponents/LoginForm.vue
    154 154 this.$store.commit("saveToken", loginResponse.token);
    155 155 await this.$router.push("/");
    156 156 } else {
    157 console.log("Something went wrong");
    157 //console.log("Something went wrong");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/FormComponents/NewPasswordForm.vue
    130 130 this.v$.user.$touch();
    131 131
    132 132 if (this.v$.user.$invalid) {
    133 console.log("Invalid, exiting...");
    133 //console.log("Invalid, exiting...");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/FormComponents/NewPasswordForm.vue
    142 142 const newPasswordResponse = doNewPassword(newPasswordInfo);
    143 143
    144 144 if (newPasswordResponse.newPasswordSet === true) {
    145 console.log("New password set");
    145 //console.log("New password set");
    146 146 await this.$router.push("/");
    147 147 } else if (newPasswordResponse.newPasswordSet === false) {
    148 console.log("Couldn't set new password");
    148 //console.log("Couldn't set new password");
    149 149 } else {
    150 console.log("Something went wrong");
    150 //console.log("Something went wrong");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/FormComponents/ResetPasswordForm.vue
    83 83 this.v$.email.$touch();
    84 84
    85 85 if (this.v$.email.$invalid) {
    86 console.log("Ugyldig, avslutter...");
    86 //console.log("Ugyldig, avslutter...");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/ItemComponents/NewItemForm.vue
    311 311 },
    312 312 methods: {
    313 313 checkValidation: function () {
    314 console.log("sjekker validering");
    314 //console.log("sjekker validering");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/ItemComponents/NewItemForm.vue
    335 335 this.checkUser();
    336 336
    337 console.log("Tittel: " + this.item.title);
    338 console.log("Kategori: " + this.item.select);
    339 console.log("Beskrivelse: " + this.item.description);
    340 console.log("Addressen: " + this.item.address);
    341 console.log("Pris: " + this.item.price);
    342 console.log("bilder: " + this.item.images);
    343 console.log("gruppe: " + this.item.selectedGroups);
    337 //console.log("Tittel: " + this.item.title);
    338 //console.log("Kategori: " + this.item.select);
    339 //console.log("Beskrivelse: " + this.item.description);
    340 //console.log("Addressen: " + this.item.address);
    341 //console.log("Pris: " + this.item.price);
    342 //console.log("bilder: " + this.item.images);
    343 //console.log("gruppe: " + this.item.selectedGroups);
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/ItemComponents/NewItemForm.vue
    352 352 communityIDs: this.item.selectedGroups,
    353 353 };
    354 354
    355 console.log(itemInfo);
    355 //console.log(itemInfo);
    356 356
    357 const postRequest = await postNewItem(itemInfo);
    357 /* const postRequest = */ await postNewItem(itemInfo);
    358 358
    359 console.log("posted: " + postRequest);
    359 //console.log("posted: " + postRequest);
    360 360
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/ItemComponents/NewItemForm.vue
    368 368 },
    369 369
    370 370 addImage: function (event) {
    371 console.log(event.target.files);
    371 //console.log(event.target.files);
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/ItemComponents/NewItemForm.vue
    379 379 onChangeGroup: function (e) {
    380 380 this.selectedGroupId = e.target.value;
    381 381 let alreadyInGroupList = false;
    382 console.log("selected clicked");
    382 //console.log("selected clicked");
  • Håkon Eilertsen Røskaft
    Håkon Eilertsen Røskaft @haakoero started a thread on the diff
    • src/components/TimepickerComponents/DatepickerRange/MonthSelector.vue
    81 81 this.$emit("back", this.type);
    82 82 },
    83 83 forward() {
    84 console.log(this.type);
    84 //console.log(this.type);
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
    • Please register or sign in to reply