Merge pull request #467 from Seluj78/466-final-checklist

466 final checklist

Author: supalarry

docker-compose.yml

@@ -82,10 +82,8 @@ services:
     build:
       context: .
       dockerfile: frontend.Dockerfile
-    volumes:
-      - './frontend:/frontend'
     ports:
-      - '4242:8080'
+      - '4242:5000'
     networks:
       - backend-net
 

frontend.Dockerfile

@@ -6,7 +6,10 @@ ENV PATH /frontend/node_modules/.bin:$PATH
 
 COPY frontend/package.json /frontend/package.json
 COPY frontend/yarn.lock /frontend/yarn.lock
+COPY ./frontend .
 
 RUN yarn install
 
-CMD ["yarn", "serve"]
+RUN yarn build
+
+CMD ["serve", "-s", "dist"]

frontend/package.json

@@ -16,6 +16,7 @@
     "jwt-decode": "^3.0.0",
     "nouislider": "^14.6.2",
     "secure-ls": "^1.2.6",
+    "serve": "^11.3.2",
     "tailwindcss": "^1.8.10",
     "vee-validate": "^3.4.1",
     "vue": "^2.6.11",

frontend/src/App.vue

@@ -37,6 +37,10 @@ body,
   height: 100%;
 }
 
+body {
+  margin: 0;
+}
+
 ::placeholder {
   @apply font-normal;
 }

frontend/src/components/app/matches/Chat.vue

@@ -101,15 +101,15 @@ export default {
       const response = await this.$http.post('/messages/send', {
         to_uid: this.user.id.toString(),
         content: this.message,
-      });
+      }, { accessTokenRequired: true });
       this.messages.push(response.data.new_message);
       this.message = '';
       this.$emit('new-message');
       this.scrollChatToBottom();
     },
     async fetchNewMessages() {
-      await this.$http.post(`/messages/see/${this.chatWithUserId}`);
-      const messagesRequest = await this.$http.get(`/conversations/${this.chatWithUserId}`);
+      await this.$http.post(`/messages/see/${this.chatWithUserId}`, null, { accessTokenRequired: true });
+      const messagesRequest = await this.$http.get(`/conversations/${this.chatWithUserId}`, { accessTokenRequired: true });
       const newMessages = messagesRequest.data.messages;
       const oldMessageCount = this.messages.length;
       this.messages = newMessages;
@@ -121,11 +121,11 @@ export default {
       }
     },
     async prepareChatForNewUser() {
-      await this.$http.post(`/messages/see/${this.chatWithUserId}`);
-      const messagesRequest = await this.$http.get(`/conversations/${this.chatWithUserId}`);
+      await this.$http.post(`/messages/see/${this.chatWithUserId}`, null, { accessTokenRequired: true });
+      const messagesRequest = await this.$http.get(`/conversations/${this.chatWithUserId}`, { accessTokenRequired: true });
       this.messages = messagesRequest.data.messages;
       this.determineFirstMessagesOfTimespans(this.messages);
-      const userRequest = await this.$http.get(`/users/${this.chatWithUserId}`);
+      const userRequest = await this.$http.get(`/users/${this.chatWithUserId}`, { accessTokenRequired: true });
       this.user = userRequest.data;
       this.scrollChatToBottom();
     },

frontend/src/components/app/matches/MessageBubble.vue

@@ -56,10 +56,10 @@ export default {
       }
       if (!isLiked) {
         this.message.is_liked = true;
-        await this.$http.post(`/messages/like/${id}`);
+        await this.$http.post(`/messages/like/${id}`, null, { accessTokenRequired: true });
       } else {
         this.message.is_liked = false;
-        await this.$http.post(`/messages/unlike/${id}`);
+        await this.$http.post(`/messages/unlike/${id}`, null, { accessTokenRequired: true });
       }
     },
   },

frontend/src/components/app/onboarding/Location.vue

@@ -51,7 +51,7 @@ export default {
       this.$emit('next-slide');
     },
     async sendLocation() {
-      await this.$http.put('/profile/edit/geolocation', this.locationData);
+      await this.$http.put('/profile/edit/geolocation', this.locationData, { accessTokenRequired: true });
     },
   },
   mounted() {

frontend/src/components/app/onboarding/MainAndSecondaryImagesUpload.vue

@@ -52,9 +52,9 @@ export default {
           const formData = new FormData();
           formData.append('file[]', this.imagesUploaded[i].content);
           if (i === 0) {
-            await this.$http.post('/profile/images?is_primary=true', formData);
+            await this.$http.post('/profile/images?is_primary=true', formData, { accessTokenRequired: true });
           } else {
-            await this.$http.post('/profile/images?is_primary=false', formData);
+            await this.$http.post('/profile/images?is_primary=false', formData, { accessTokenRequired: true });
           }
         } catch (error) {}
       }

frontend/src/components/app/settings/AccountInput.vue

@@ -85,25 +85,25 @@ export default {
       this.currentValueBackup = this.currentValue;
       try {
         if (this.type === 'firstName') {
-          await this.$http.patch('/profile/edit/first_name', { first_name: this.currentValue });
+          await this.$http.patch('/profile/edit/first_name', { first_name: this.currentValue }, { accessTokenRequired: true });
         } else if (this.type === 'lastName') {
-          await this.$http.patch('/profile/edit/last_name', { last_name: this.currentValue });
+          await this.$http.patch('/profile/edit/last_name', { last_name: this.currentValue }, { accessTokenRequired: true });
         } else if (this.type === 'email') {
-          await this.$http.put('/profile/edit/email', { email: this.currentValue });
+          await this.$http.put('/profile/edit/email', { email: this.currentValue }, { accessTokenRequired: true });
         } else if (this.type === 'username') {
-          await this.$http.patch('/profile/edit/username', { username: this.currentValue });
+          await this.$http.patch('/profile/edit/username', { username: this.currentValue }, { accessTokenRequired: true });
         } else if (this.type === 'bio') {
-          await this.$http.patch('/profile/edit/bio', { bio: this.currentValue });
+          await this.$http.patch('/profile/edit/bio', { bio: this.currentValue }, { accessTokenRequired: true });
         } else if (this.type === 'password') {
           await this.$http.put('/profile/edit/password', {
             old_password: this.passwordOld,
             new_password: this.currentValue,
-          });
+          }, { accessTokenRequired: true });
           this.currentValue = '';
           this.passwordRepeat = '';
           this.passwordOld = '';
         }
-        const user = await this.$http.get(`/users/${this.$store.getters.getLoggedInUser.id}`);
+        const user = await this.$http.get(`/users/${this.$store.getters.getLoggedInUser.id}`, { accessTokenRequired: true });
         await this.$store.dispatch('login', user.data);
       } catch (error) {
         this.error = error.response.data.error.message;

frontend/src/components/app/users/User.vue

@@ -35,17 +35,28 @@ export default {
     goBack() {
       this.$router.go(-1);
     },
+    sortImages() {
+      const userImagesLength = this.user.images.length;
+      for (let i = 0; i < userImagesLength; i += 1) {
+        if (this.user.images[i].is_primary && i !== 0) {
+          this.user.images.splice(0, 0, this.user.images[i]);
+          this.user.images.splice(i + 1, 1);
+          return;
+        }
+      }
+    },
   },
   watch: {
     async $route() {
-      const userRequest = await this.$http.get(`/profile/view/${this.$route.params.id}`);
+      const userRequest = await this.$http.get(`/profile/view/${this.$route.params.id}`, { accessTokenRequired: true });
       this.user = userRequest.data.profile;
     },
   },
   async beforeMount() {
     try {
-      const userRequest = await this.$http.get(`/profile/view/${this.$route.params.id}`);
+      const userRequest = await this.$http.get(`/profile/view/${this.$route.params.id}`, { accessTokenRequired: true });
       this.user = userRequest.data.profile;
+      this.sortImages();
     } catch (error) {
       this.error = error.response.data.error.message;
     }