Merge pull request #249 from SelfhostedPro/projects

fixed DISABLE_AUTH still showing settings
SelfhostedPro · Jan 16, 2021 · f5453eb · f5453eb
2 parents da142eb + 154b7f7
commit f5453eb
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 18 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,15 +11,34 @@ jobs:
     steps:
       - name: checkout code
         uses: actions/checkout@v2
-      - name: install buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }} 
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
         with:
-          qemu-version: latest
-      - name: login to docker hub
-        run: echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-      - name: build the image
-        run: |
-          docker buildx build --push \
-            --tag selfhostedpro/yacht:latest \
-            --platform linux/amd64,linux/arm,linux/arm64 .
+          platforms: linux/amd64,linux/arm64,linux/arm
+          push: true
+          tags: |
+            selfhostedpro/yacht:latest
+            selfhostedpro/yacht:do
+            selfhostedpro/yacht:omv
+            selfhostedpro/yacht:vue
+            ghcr.io/selfhostedpro/yacht:latest
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapGetters, mapActions } from "vuex";
 import Sidebar from "./components/nav/Sidebar";
 import Appbar from "./components/nav/Appbar";
 import LoginForm from "./components/auth/LoginForm";
@@ -50,20 +50,20 @@ export default {
   data: () => ({}),
   computed: {
     ...mapGetters({
-      isLoggedIn: "auth/isAuthenticated"
-      // authDisabled: "auth/authDisabled"
+      isLoggedIn: "auth/isAuthenticated",
+      authDisabled: "auth/authDisabled"
     }),
     theme() {
       return this.$vuetify.theme.dark ? "dark" : "light";
     }
   },
   methods: {
-    // ...mapActions({
-    //   authCheck: "auth/AUTH_CHECK"
-    // })
+    ...mapActions({
+      authCheck: "auth/AUTH_CHECK"
+    })
   },
   created() {
-    // this.authCheck();
+    this.authCheck();
   },
   mounted() {
     const dark_theme = localStorage.getItem("dark_theme");