Merge pull request #37 from saferwall/2022-fixing

⚒ Fix 401 redirection, style lagging , env
saferwall · Jan 29, 2022 · fa1594d · fa1594d
2 parents 9d266e1 + 6918134
commit fa1594d
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 96 deletions.
diff --git a/.env → .env.example b/.env → .env.example
@@ -1,3 +1,2 @@
-VUE_APP_ENV=dev
 VUE_APP_API_BASE_URL="https://api.saferwall.com/v1/"
 VUE_APP_AVATAR_BASE_URL="https://avatar.saferwall.com/"
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,6 +6,9 @@ on:
       - build
 env:
   IMAGE: saferwall/ui
+  VUE_APP_API_BASE_URL: "https://api.saferwall.com/v1/"
+  VUE_APP_AVATAR_BASE_URL: "https://avatar.saferwall.com/"
+
 jobs:
   yarn-build:
     runs-on: ubuntu-20.04

diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,4 @@ pnpm-debug.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.sw?
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -1,18 +1,4 @@
 #!/bin/sh
 
-# Replace env vars in JavaScript files
-echo "Replacing env vars in JS"
-for file in /usr/share/nginx/html/js/app.*.js;
-do
-  echo "Processing $file ...";
-
-  # Use the existing JS file as template
-  if [ ! -f $file.tmpl.js ]; then
-    cp $file $file.tmpl.js
-  fi
-
-  envsubst '$VUE_APP_BACKEND_HOST' < $file.tmpl.js > $file
-done
-
 echo "Starting Nginx"
 nginx -g 'daemon off;'
diff --git a/src/assets/css/index.css → src/assets/scss/index.scss b/src/assets/css/index.css → src/assets/scss/index.scss
@@ -69,18 +69,28 @@ body * {
   @apply bg-primary;
 }
 
-.auth-card .form-input {
-  @apply w-full px-4 py-3 border rounded-md border-gray-light placeholder-gray-medium text-lg;
-}
-
-.auth-card .form-group {
-  @apply w-full my-3 flex flex-wrap items-center;
-}
 
-.auth-card .btn-submit {
-  @apply w-full px-4 py-4 bg-primary rounded-md text-light font-bold text-lg;
-}
-
-.auth-card {
-  @apply mt-4 flex min-w-full md:min-w-6/7 lg:min-w-5/7 xl:min-w-6/12 bg-light md:rounded-2xl py-10 px-20 shadow-sm;
+/**
+* Auth Pages
+*/
+.auth-card
+{
+
+  .form-input {
+    @apply w-full px-4 py-3 border rounded-md border-gray-light placeholder-gray-medium text-lg;
+  }
+
+  .form-group {
+    @apply w-full my-3 flex flex-wrap items-center;
+  }
+
+  .btn-submit {
+    @apply w-full px-4 py-4 bg-primary rounded-md text-light font-bold text-lg;
+  }
+
+
+  @apply bg-light md:rounded-2xl  shadow-sm;
+  @apply flex items-center justify-center;
+  @apply m-auto py-10 px-20;
+  @apply w-full max-w-xl;
 }
diff --git a/src/common/components/content/FileContent.vue b/src/common/components/content/FileContent.vue
@@ -26,6 +26,7 @@
           {{ title }}
         </h1>
         <div class="buttons">
+          <!-- Scan Button -->
           <btn v-if="false" class="disabled">
             <svg
               xmlns="http://www.w3.org/2000/svg"
@@ -46,49 +47,11 @@
               </g>
             </svg>
 
-            Refile File
+            Rescan File
           </btn>
-          <btn v-if="false" class="disabled">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="20.786"
-              height="16.889"
-              viewBox="0 0 20.786 16.889"
-            >
-              <g transform="translate(0 -48)">
-                <g transform="translate(0 48)">
-                  <path
-                    d="M20.786,50a8.885,8.885,0,0,1-2.455.673,4.237,4.237,0,0,0,1.875-2.355,8.516,8.516,0,0,1-2.7,1.032,4.261,4.261,0,0,0-7.371,2.914,4.388,4.388,0,0,0,.1.972,12.062,12.062,0,0,1-8.784-4.457,4.263,4.263,0,0,0,1.31,5.7,4.208,4.208,0,0,1-1.925-.525v.047a4.281,4.281,0,0,0,3.414,4.187,4.253,4.253,0,0,1-1.117.14,3.768,3.768,0,0,1-.807-.073A4.3,4.3,0,0,0,6.3,61.218,8.562,8.562,0,0,1,1.02,63.035,7.982,7.982,0,0,1,0,62.977a12,12,0,0,0,6.537,1.912A12.045,12.045,0,0,0,18.666,52.763c0-.188-.006-.37-.016-.551A8.5,8.5,0,0,0,20.786,50Z"
-                    transform="translate(0 -48)"
-                    fill="#0d9677"
-                  />
-                </g>
-              </g>
-            </svg>
-
-            Share
-          </btn>
-          <btn :link="downloadLink" :download="getFileName">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="20"
-              height="20"
-              viewBox="0 0 20 20"
-            >
-              <path
-                d="M14.81,9.36,9.252,14.529,3.694,9.36l1.022-.951,3.813,3.546V0H9.975V11.955l3.813-3.546Zm3.694,6.5H0v1.344H18.5Zm0,0"
-                transform="translate(0.25 0.25)"
-                fill="currentColor"
-                stroke="currentColor"
-                stroke-width="0.5"
-              />
-            </svg>
+          <!-- END: Scan Button -->
 
-            Download File
-          </btn>
-          <btn-like @click="toggleLike" :liked="dliked">
-            {{ dliked ? "Unlike" : "Like" }}
-          </btn-like>
+          <!-- Share Button -->
           <a
             :href="'https://twitter.com/intent/tweet?text=' + getShareTweet"
             target="_blank"
@@ -109,6 +72,41 @@
               Share
             </btn>
           </a>
+          <!-- END: Share Button -->
+
+          <!-- Download Button -->
+          <div @click="this.$router.push({ name: 'login' })">
+            <btn
+              :link="isloggedIn ? downloadLink : null"
+              :download="isloggedIn ? getFileName : null"
+              :target="isloggedIn ? '_blank' : ''"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="20"
+                height="20"
+                viewBox="0 0 20 20"
+              >
+                <path
+                  d="M14.81,9.36,9.252,14.529,3.694,9.36l1.022-.951,3.813,3.546V0H9.975V11.955l3.813-3.546Zm3.694,6.5H0v1.344H18.5Zm0,0"
+                  transform="translate(0.25 0.25)"
+                  fill="currentColor"
+                  stroke="currentColor"
+                  stroke-width="0.5"
+                />
+              </svg>
+
+              Download File
+            </btn>
+          </div>
+
+          <!-- END: Download Button -->
+
+          <!-- Like Button -->
+          <btn-like @click="toggleLike" :liked="dliked">
+            {{ dliked ? "Unlike" : "Like" }}
+          </btn-like>
+          <!-- END: Like Button -->
         </div>
       </div>
     </div>
@@ -123,7 +121,12 @@ import APP_CONFIGS from "@/common/config";
 
 import Btn from "@/common/components/elements/button/Btn.vue";
 import BtnLike from "@/common/components/elements/button/BtnLike.vue";
-import { fileGetters, fileMethods, fileActions } from "@/state/helpers";
+import {
+  authGetters,
+  fileGetters,
+  fileMethods,
+  fileActions,
+} from "@/state/helpers";
 
 export default {
   components: { Btn, BtnLike },
@@ -138,6 +141,7 @@ export default {
     dliked: false,
     hash: null,
     downloadLink: null,
+    isloggedIn: false,
   }),
   computed: {
     ...fileGetters,
@@ -154,6 +158,7 @@ export default {
   methods: {
     ...fileActions,
     ...fileMethods,
+    ...authGetters,
     goBack() {
       this.$router.go(-1);
     },
@@ -170,16 +175,15 @@ export default {
       });
     },
     async refreshContent() {
-      this.file = await this.getFile;
+      this.isloggedIn = await this.loggedIn();
 
+      this.file = await this.getFile;
       this.hash = this.file.sha256;
-      this.downloadLink = `${APP_CONFIGS.apiURL}files/${this.hash}/download/`;
-
       this.dliked = this.file.liked;
+      this.downloadLink = `${APP_CONFIGS.apiURL}files/${this.hash}/download/`;
     },
     updateLike(liked) {
       this.dliked = liked == true;
-      console.log("update like : ", liked);
       this.updateRefreshStatus(true);
     },
   },

diff --git a/src/layouts/AuthLayout.vue b/src/layouts/AuthLayout.vue
@@ -1,12 +1,14 @@
 <template >
   <base-layout>
     <template v-slot:navbar>
-      <div class="logo">
-        <logo />
-      </div>
+      <Navbar>
+        <div class="logo">
+          <logo />
+        </div>
+      </Navbar>
     </template>
     <template v-slot:main>
-      <Content class="main-content">
+      <Content>
         <slot />
       </Content>
     </template>
@@ -17,22 +19,20 @@
 import BaseLayout from "@/layouts/BaseLayout.vue";
 import Logo from "@/common/components/elements/Logo.vue";
 import Content from "@/common/components/content/Content.vue";
+import Navbar from "@/common/components/partials/Navbar.vue";
 
 export default {
   components: {
     BaseLayout,
     Content,
+    Navbar,
     Logo,
   },
 };
 </script>
 
 <style lang="scss" scoped>
 .logo {
-  @apply w-full md:w-sidebar md:px-6 px-5 flex justify-center md:justify-start text-black font-extrabold;
-  height: 100%;
-}
-.main-content {
-  @apply flex items-center justify-center py-10;
+  @apply flex w-full md:w-sidebar px-5  justify-center text-black font-extrabold;
 }
 </style>
diff --git a/src/main.js b/src/main.js
@@ -9,7 +9,7 @@ import AppLayout from '@/layouts/AppLayout.vue'
 /**
  * Css ( +TailwindCss )
  */
-import '@/assets/css/index.css'
+import '@/assets/scss/index.scss'
 import 'mosha-vue-toastify/dist/style.css'
 import 'nprogress/nprogress.css';
 
@@ -30,7 +30,7 @@ import titleMixin from '@/common/mixins/titleMixin'
  */
 import setupInterceptors from '@/services/setupInterceptors';
 
-setupInterceptors(store);
+setupInterceptors(router);
 
 /**
  * Vue Application 

diff --git a/src/modules/auth/pages/Login.vue b/src/modules/auth/pages/Login.vue
@@ -97,19 +97,18 @@ export default {
   methods: {
     ...authMethods,
     formSubmited: function (e) {
+      const { username, password } = this;
+
       e.preventDefault();
 
       this.errors = [];
-      if (!this.username) this.errors.push("Username required.");
-      if (!this.password) this.errors.push("Password required.");
+      if (!username) this.errors.push("Username required.");
+      if (!password) this.errors.push("Password required.");
+
       if (this.errors.length > 0) return true;
 
-      this.logIn({
-        username: this.username,
-        password: this.password,
-      })
+      this.logIn({ username, password })
         .then(() => {
-          // Redirect to the originally requested page, or to the home page
           this.$router.push(
             this.$route.query.redirectFrom || {
               name: "profile",
@@ -118,7 +117,8 @@ export default {
         })
         .catch((error) => {
           this.errors.push(
-            error.response ? error.response.data.message : "Something wrong !"
+            (error.response && error.response.data.message) ||
+              "Something wrong !"
           );
         });
     },

diff --git a/src/services/setupInterceptors.js b/src/services/setupInterceptors.js
@@ -1,13 +1,13 @@
 import axios from '@/services/axios'
 
-const setup = (store) => {
+const setup = (router) => {
     axios.interceptors.response.use(
         (res) => {
             return res;
         },
         async (err) => {
             if (err.response.status === 401) {
-                store.commit('auth/LOGOUT');
+                return router.push({ path: '/auth/login' });
             }
 
             return Promise.reject(err);
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,4 +21,4 @@ pnpm-debug.log* @@
     *.ntvs*
     *.njsproj
     *.sln
-    *.sw?
+    *.sw?