Merge pull request #97 from tdu-logcation/fix/versions

バージョン表示のバグ修正
tdu-logcation · Nov 6, 2021 · 2f5e91f · 2f5e91f
2 parents 8655d5c + 19723b2
commit 2f5e91f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/components/Footer.tsx b/components/Footer.tsx
@@ -6,7 +6,7 @@
 
 import {Box, Text, Center, Flex, Spacer, Link} from '@chakra-ui/react';
 import {colors} from '../utils/colors';
-import {HiExternalLink} from 'react-icons/hi';
+import {v} from '../utils/version';
 
 export const Footer = () => {
   return (
@@ -16,10 +16,7 @@ export const Footer = () => {
           <Box>
             <Link href="https://github.com/tdu-logcation/web" isExternal>
               <Box color={colors('textSecondly')} fontSize=".7rem">
-                <Flex>
-                  GitHub
-                  <HiExternalLink />
-                </Flex>
+                {v}
               </Box>
             </Link>
           </Box>

diff --git a/components/Version.tsx b/components/Version.tsx
@@ -10,6 +10,7 @@ import {
   ModalFooter,
   ModalContent,
   Link,
+  Text,
 } from '@chakra-ui/react';
 import {v} from '../utils/version';
 import {version} from '../utils/recoilAtoms';
@@ -21,7 +22,7 @@ const Version = () => {
   const {isOpen, onOpen, onClose} = useDisclosure();
 
   React.useEffect(() => {
-    if (_version !== v) {
+    if (_version !== v || v === 'dev') {
       // バージョンの更新とモーダル表示
       onOpen();
       setVersion(v);
@@ -39,13 +40,22 @@ const Version = () => {
       >
         <ModalOverlay />
         <ModalContent>
-          <ModalHeader>Logcation 新着情報</ModalHeader>
+          <ModalHeader>Logcation "{v}" 新着情報</ModalHeader>
           <ModalCloseButton size="lg" />
           <ModalBody>
             詳しくは、
-            <br />
-            <Link isExternal>
-              https://github.com/hello-slide/front/releases/tag{v}/
+            <Link
+              isExternal
+              href={
+                v !== 'dev'
+                  ? `https://github.com/tdu-logcation/web/releases/tag/${v}/`
+                  : 'https://github.com/tdu-logcation/web'
+              }
+              _hover={{color: 'blue.300'}}
+            >
+              <Text fontWeight="bold" textDecoration="underline" as="span">
+                リリースノート
+              </Text>
             </Link>
             を参照してください。
           </ModalBody>

diff --git a/utils/version.ts b/utils/version.ts
@@ -1 +1 @@
-export const v = 'v1.0.1';
+export const v = 'dev';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const v = 'v1.0.1';
		export const v = 'dev';