修改外觀

public/logo.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="30px" height="30px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g><path style="opacity:1" fill="#083a60" d="M 29.5,25.5 C 29.5,25.8333 29.5,26.1667 29.5,26.5C 25.1539,26.6657 20.8206,26.499 16.5,26C 17.428,25.6121 18.0946,24.9454 18.5,24C 17.8524,22.5603 17.5191,21.0603 17.5,19.5C 17.631,18.7611 17.4643,18.0944 17,17.5C 15.8118,18.5634 15.3118,19.8967 15.5,21.5C 14.8333,21.5 14.1667,21.5 13.5,21.5C 13.6882,19.8967 13.1882,18.5634 12,17.5C 11.5357,18.0944 11.369,18.7611 11.5,19.5C 11.4809,21.0603 11.1476,22.5603 10.5,24C 10.9054,24.9454 11.572,25.6121 12.5,26C 8.17944,26.499 3.84611,26.6657 -0.5,26.5C -0.5,26.1667 -0.5,25.8333 -0.5,25.5C 0.495904,25.5858 1.32924,25.2524 2,24.5C 3,21.5 4,18.5 5,15.5C 5.7581,13.2305 5.59143,11.0639 4.5,9C 6.76948,8.2419 8.93615,8.40857 11,9.5C 12.2579,7.23561 13.4246,4.90228 14.5,2.5C 15.5754,4.90228 16.7421,7.23561 18,9.5C 20.0639,8.40857 22.2305,8.2419 24.5,9C 23.4086,11.0639 23.2419,13.2305 24,15.5C 25,18.5 26,21.5 27,24.5C 27.6708,25.2524 28.5041,25.5858 29.5,25.5 Z M 8.5,13.5 C 9.12395,13.9169 9.45728,14.5836 9.5,15.5C 8.63214,18.9899 7.46548,22.3233 6,25.5C 6.49527,21.4918 7.3286,17.4918 8.5,13.5 Z M 19.5,13.5 C 21.5686,17.2089 22.7353,21.2089 23,25.5C 21.1357,21.7366 19.969,17.7366 19.5,13.5 Z"/></g>
+<g><path style="opacity:0.004" fill="#01070e" d="M 15.5,13.5 C 14.8333,13.5 14.1667,13.5 13.5,13.5C 14.1667,10.8333 14.8333,10.8333 15.5,13.5 Z"/></g>
+<g><path style="opacity:0.082" fill="#000c0f" d="M 13.5,21.5 C 12.8333,20.8333 12.1667,20.1667 11.5,19.5C 11.369,18.7611 11.5357,18.0944 12,17.5C 13.1882,18.5634 13.6882,19.8967 13.5,21.5 Z"/></g>
+<g><path style="opacity:0.082" fill="#000c0f" d="M 17.5,19.5 C 16.8333,20.1667 16.1667,20.8333 15.5,21.5C 15.3118,19.8967 15.8118,18.5634 17,17.5C 17.4643,18.0944 17.631,18.7611 17.5,19.5 Z"/></g>
+</svg>

resources/js/src/@core/layouts/components/Logo.vue

@@ -1,93 +1,45 @@
 <template>
-  <svg
-    viewBox="0 0 139 95"
-    version="1.1"
-    xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    height="24"
-  >
-    <defs>
-      <linearGradient
-        id="linearGradient-1"
-        x1="100%"
-        y1="10.5120544%"
-        x2="50%"
-        y2="89.4879456%"
-      >
-        <stop
-          stop-color="#000000"
-          offset="0%"
-        />
-        <stop
-          stop-color="#FFFFFF"
-          offset="100%"
-        />
-      </linearGradient>
-      <linearGradient
-        id="linearGradient-2"
-        x1="64.0437835%"
-        y1="46.3276743%"
-        x2="37.373316%"
-        y2="100%"
-      >
-        <stop
-          stop-color="#EEEEEE"
-          stop-opacity="0"
-          offset="0%"
-        />
-        <stop
-          stop-color="#FFFFFF"
-          offset="100%"
-        />
-      </linearGradient>
-    </defs>
-    <g
-      id="Page-1"
-      stroke="none"
-      stroke-width="1"
-      fill="none"
-      fill-rule="evenodd"
+    <svg
+        xmlns="http://www.w3.org/2000/svg"
+        version="1.1"
+        width="30px"
+        height="30px"
+        style="
+            shape-rendering: geometricPrecision;
+            text-rendering: geometricPrecision;
+            image-rendering: optimizeQuality;
+            fill-rule: evenodd;
+            clip-rule: evenodd;
+        "
+        xmlns:xlink="http://www.w3.org/1999/xlink"
     >
-      <g
-        id="Artboard"
-        transform="translate(-400.000000, -178.000000)"
-      >
-        <g
-          id="Group"
-          transform="translate(400.000000, 178.000000)"
-        >
-          <path
-            id="Path"
-            class="text-primary"
-            d="M-5.68434189e-14,2.84217094e-14 L39.1816085,2.84217094e-14 L69.3453773,32.2519224 L101.428699,2.84217094e-14 L138.784583,2.84217094e-14 L138.784199,29.8015838 C137.958931,37.3510206 135.784352,42.5567762 132.260463,45.4188507 C128.736573,48.2809251 112.33867,64.5239941 83.0667527,94.1480575 L56.2750821,94.1480575 L6.71554594,44.4188507 C2.46876683,39.9813776 0.345377275,35.1089553 0.345377275,29.8015838 C0.345377275,24.4942122 0.230251516,14.560351 -5.68434189e-14,2.84217094e-14 Z"
-            style="fill:currentColor"
-          />
-          <path
-            id="Path1"
-            d="M69.3453773,32.2519224 L101.428699,1.42108547e-14 L138.784583,1.42108547e-14 L138.784199,29.8015838 C137.958931,37.3510206 135.784352,42.5567762 132.260463,45.4188507 C128.736573,48.2809251 112.33867,64.5239941 83.0667527,94.1480575 L56.2750821,94.1480575 L32.8435758,70.5039241 L69.3453773,32.2519224 Z"
-            fill="url(#linearGradient-1)"
-            opacity="0.2"
-          />
-          <polygon
-            id="Path-2"
-            fill="#000000"
-            opacity="0.049999997"
-            points="69.3922914 32.4202615 32.8435758 70.5039241 54.0490008 16.1851325"
-          />
-          <polygon
-            id="Path-21"
-            fill="#000000"
-            opacity="0.099999994"
-            points="69.3922914 32.4202615 32.8435758 70.5039241 58.3683556 20.7402338"
-          />
-          <polygon
-            id="Path-3"
-            fill="url(#linearGradient-2)"
-            opacity="0.099999994"
-            points="101.428699 0 83.0667527 94.1480575 130.378721 47.0740288"
-          />
+        <g>
+            <path
+                style="opacity: 1"
+                fill="#083a60"
+                d="M 29.5,25.5 C 29.5,25.8333 29.5,26.1667 29.5,26.5C 25.1539,26.6657 20.8206,26.499 16.5,26C 17.428,25.6121 18.0946,24.9454 18.5,24C 17.8524,22.5603 17.5191,21.0603 17.5,19.5C 17.631,18.7611 17.4643,18.0944 17,17.5C 15.8118,18.5634 15.3118,19.8967 15.5,21.5C 14.8333,21.5 14.1667,21.5 13.5,21.5C 13.6882,19.8967 13.1882,18.5634 12,17.5C 11.5357,18.0944 11.369,18.7611 11.5,19.5C 11.4809,21.0603 11.1476,22.5603 10.5,24C 10.9054,24.9454 11.572,25.6121 12.5,26C 8.17944,26.499 3.84611,26.6657 -0.5,26.5C -0.5,26.1667 -0.5,25.8333 -0.5,25.5C 0.495904,25.5858 1.32924,25.2524 2,24.5C 3,21.5 4,18.5 5,15.5C 5.7581,13.2305 5.59143,11.0639 4.5,9C 6.76948,8.2419 8.93615,8.40857 11,9.5C 12.2579,7.23561 13.4246,4.90228 14.5,2.5C 15.5754,4.90228 16.7421,7.23561 18,9.5C 20.0639,8.40857 22.2305,8.2419 24.5,9C 23.4086,11.0639 23.2419,13.2305 24,15.5C 25,18.5 26,21.5 27,24.5C 27.6708,25.2524 28.5041,25.5858 29.5,25.5 Z M 8.5,13.5 C 9.12395,13.9169 9.45728,14.5836 9.5,15.5C 8.63214,18.9899 7.46548,22.3233 6,25.5C 6.49527,21.4918 7.3286,17.4918 8.5,13.5 Z M 19.5,13.5 C 21.5686,17.2089 22.7353,21.2089 23,25.5C 21.1357,21.7366 19.969,17.7366 19.5,13.5 Z"
+            />
         </g>
-      </g>
-    </g>
-  </svg>
+        <g>
+            <path
+                style="opacity: 0.004"
+                fill="#01070e"
+                d="M 15.5,13.5 C 14.8333,13.5 14.1667,13.5 13.5,13.5C 14.1667,10.8333 14.8333,10.8333 15.5,13.5 Z"
+            />
+        </g>
+        <g>
+            <path
+                style="opacity: 0.082"
+                fill="#000c0f"
+                d="M 13.5,21.5 C 12.8333,20.8333 12.1667,20.1667 11.5,19.5C 11.369,18.7611 11.5357,18.0944 12,17.5C 13.1882,18.5634 13.6882,19.8967 13.5,21.5 Z"
+            />
+        </g>
+        <g>
+            <path
+                style="opacity: 0.082"
+                fill="#000c0f"
+                d="M 17.5,19.5 C 16.8333,20.1667 16.1667,20.8333 15.5,21.5C 15.3118,19.8967 15.8118,18.5634 17,17.5C 17.4643,18.0944 17.631,18.7611 17.5,19.5 Z"
+            />
+        </g>
+    </svg>
 </template>

resources/js/src/router/config.js

@@ -163,22 +163,8 @@ export const settings = {
             component: () => import('@/views/lottery/drawButton.vue'),
             meta: {
                 layout: 'full',
-                requiresAuth: true,
                 pageTitle: '中獎清單',
-                breadcrumb: [{
-                        text: '活動列表',
-                        to: '/activityList'
-                    },
-                    {
-                        text: '活動功能頁面',
-                        to: '/activityPage'
-                    },
-                    {
-                        text: '中獎清單',
-                        active: true,
-                    },
-                ],
-                requiresAuth: false,
+                requiresAuth: true,
             },
         },
         {
@@ -339,7 +325,7 @@ export const settings = {
                         active: true,
                     },
                 ],
-                requiresAuth: true,
+                requiresAuth: false,
 
             },
         },

resources/js/src/views/Login.vue

@@ -3,8 +3,7 @@
 		<b-row class="auth-inner m-0">
 			<!-- Brand logo-->
 			<b-link class="brand-logo">
-				<vuexy-logo />
-				<h2 class="brand-text text-primary ml-1">MAA</h2>
+				<b-img src="/maa-logo.png" width="70" />
 			</b-link>
 			<!-- /Brand logo-->
 
@@ -21,11 +20,8 @@
 			<b-col lg="4" class="d-flex align-items-center auth-bg px-2 p-lg-5">
 				<b-col sm="8" md="6" lg="12" class="px-xl-2 mx-auto">
 					<b-card-title title-tag="h2" class="font-weight-bold mb-1">
-						Welcome to Vuexy! 👋
+						Welcome to MAA! 👋
 					</b-card-title>
-					<b-card-text class="mb-2">
-						請登入帳號並開始您的旅程
-					</b-card-text>
 
 					<!-- form -->
 					<validation-observer ref="loginValidation">
@@ -102,40 +98,13 @@
 						</b-form>
 					</validation-observer>
 
-					<b-card-text class="text-center mt-2">
-						<span>第一次使用此平台? </span>
-						<b-link :to="{ name: 'page-auth-register-v2' }">
-							<span>&nbsp;建立帳戶</span>
-						</b-link>
-					</b-card-text>
-
-					<!-- divider -->
-					<div class="divider my-2">
-						<div class="divider-text">or</div>
-					</div>
-
-					<!-- social buttons -->
-					<div class="auth-footer-btn d-flex justify-content-center">
-						<b-button variant="facebook" href="javascript:void(0)">
-							<feather-icon icon="FacebookIcon" />
-						</b-button>
-						<b-button variant="twitter" href="javascript:void(0)">
-							<feather-icon icon="TwitterIcon" />
-						</b-button>
-						<b-button variant="google" href="javascript:void(0)">
-							<feather-icon icon="MailIcon" />
-						</b-button>
-						<b-button variant="github" href="javascript:void(0)">
-							<feather-icon icon="GithubIcon" />
-						</b-button>
-					</div>
 					<!-- divider -->
 					<div class="divider my-2">
 						<div class="divider-text">or</div>
 					</div>
 					<div class="auth-footer-btn d-flex justify-content-center">
-						<b-button variant="facebook" :to="{ name: 'pages-blog-list' }">
-							先進行探索
+						<b-button variant="facebook" :to="{ name: 'home' }">
+							以訪客登入
 						</b-button>
 					</div>
 
@@ -198,7 +167,7 @@ export default {
 			status: "",
 			password: "",
 			account: "",
-			sideImg: require("@/assets/images/pages/login-v2.svg"),
+			sideImg: require("@/assets/images/banner/home-1.jpg"),
 			// validation rulesimport store from '@/store/index'
 			required,
 		};

resources/js/src/views/lottery/Activities/ActivityPage.vue

@@ -35,6 +35,7 @@
                 <b-card no-body border-variant="info" class="text-center">
                     <b-card-body>
                         <b-button variant="success"
+                            target="_blank"
                             :to="{ name: 'prizeList', params: { 'activity_id': this.$route.params.activity_id } }">主持人中獎名單</b-button>
                     </b-card-body>
                 </b-card>