Merge branch '0.4.1' of https://github.com/Lodestone-Team/dashboard i…

…nto RCONsetting
Lodestone-Team · Jan 19, 2023 · 0cddd25 · 0cddd25
2 parents e96d227 + a6e380f
commit 0cddd25
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 3 deletions.
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -15,7 +15,7 @@ import ReactGA from 'react-ga4';
 config.autoAddCss = false;
 axios.defaults.timeout = 5000;
 const TRACKING_ID = 'G-LZQ3VZ6N26';
-ReactGA.initialize(TRACKING_ID);
+if (process.env.NODE_ENV === 'production') ReactGA.initialize(TRACKING_ID);
 
 const contextClass = {
   default: '!bg-gray-500',

diff --git a/src/components/Atoms/Form/SelectField.tsx b/src/components/Atoms/Form/SelectField.tsx
@@ -37,7 +37,6 @@ export default function SelectField<T extends string | object>(
       } else {
         output = JSON.stringify(option);
       }
-      console.log('optionLabel', option, output);
       return output;
     },
     ...rest

diff --git a/src/components/Atoms/MultiSelectGrid.tsx b/src/components/Atoms/MultiSelectGrid.tsx
@@ -30,7 +30,6 @@ export default function MultiSelectGrid<T extends string | object>(
       } else {
         output = JSON.stringify(option);
       }
-      console.log('optionLabel', option, output);
       return output;
     },
   } = props;

diff --git a/src/components/DashboardLayout/TopNav.tsx b/src/components/DashboardLayout/TopNav.tsx
@@ -145,6 +145,7 @@ export default function TopNav() {
                     }}
                     align="end"
                     disabled={disabled}
+                    variant='text'
                   />
                 )}
               </Menu.Item>
@@ -162,6 +163,7 @@ export default function TopNav() {
                       setSearchParam('user', undefined);
                       setPathname('/login/core/select');
                     }}
+                    variant='text'
                   />
                 )}
               </Menu.Item>

diff --git a/src/components/Minecraft/MinecraftSettingCard.tsx b/src/components/Minecraft/MinecraftSettingCard.tsx
@@ -329,6 +329,7 @@ export default function MinecraftSettingCard() {
             <div className="relative flex w-5/12 shrink-0 flex-row items-center justify-end gap-4">
               <Button
                 label="Delete"
+                intention="danger"
                 disabled={!can_delete_instance}
                 onClick={() => {
                   setShowDeleteDialog(true);

diff --git a/src/components/Settings/CoreSettings.tsx b/src/components/Settings/CoreSettings.tsx
@@ -273,6 +273,7 @@ export const CoreSettings = () => {
             <div className="relative flex w-5/12 shrink-0 flex-row items-center justify-end gap-4">
               <Button
                 label="Open Port"
+                intention="danger"
                 disabled={!can_change_core_settings}
                 onClick={() => {
                   setShowOpenPortDialog(true);

diff --git a/src/components/UserBox.tsx b/src/components/UserBox.tsx
@@ -162,6 +162,7 @@ export default function UserBox({
                   label="Delete User"
                   iconRight={faTrashCan}
                   variant="text"
+                  intention="danger"
                   align="end"
                   disabled={disabled || isSelf}
                   onClick={() => setShowDeleteUser(true)}

diff --git a/src/pages/login/CoreConfigNew.tsx b/src/pages/login/CoreConfigNew.tsx
@@ -114,6 +114,7 @@ const CoreConfigNew = () => {
             <div className="flex w-full flex-row justify-end gap-4">
               <Button
                 type="submit"
+                intention="primary"
                 label="Continue"
                 iconRight={faArrowRight}
                 loading={isSubmitting}

diff --git a/src/pages/login/CoreConnect.tsx b/src/pages/login/CoreConnect.tsx
@@ -132,6 +132,7 @@ const CoreConnect = () => {
                 />
                 <Button
                   type="submit"
+                  intention="primary"
                   label="Add and Continue"
                   iconRight={faArrowRight}
                   loading={isSubmitting} //TODO: fix button size changing when loading

diff --git a/src/pages/login/CoreSelectExisting.tsx b/src/pages/login/CoreSelectExisting.tsx
@@ -112,6 +112,7 @@ const CoreSelectExisting = () => {
                 OR
               </p>
               <Button
+                type="button"
                 icon={faPlus}
                 label="Connect a new core"
                 className="flex-1"
@@ -120,6 +121,7 @@ const CoreSelectExisting = () => {
             </div>
             <div className="flex w-full flex-row justify-end gap-4">
               <Button
+                type="button"
                 iconRight={faDownload}
                 label="Download Lodestone Core"
                 onClick={() => {
@@ -131,6 +133,7 @@ const CoreSelectExisting = () => {
               />
               <Button
                 type="submit"
+                intention="primary"
                 label="Continue"
                 iconRight={faArrowRight}
                 loading={isSubmitting} //TODO: fix button size changing when loading

diff --git a/src/pages/login/CoreSetupNew.tsx b/src/pages/login/CoreSetupNew.tsx
@@ -153,6 +153,7 @@ const CoreSetupNew = () => {
               /> */}
               <Button
                 type="submit"
+                intention="primary"
                 label="Submit"
                 iconRight={faArrowRight}
                 loading={isSubmitting}

diff --git a/src/pages/login/UserLogin.tsx b/src/pages/login/UserLogin.tsx
@@ -106,6 +106,7 @@ const UserLogin = () => {
               </div>
               <Button
                 type="submit"
+                intention="primary"
                 iconRight={faArrowRight}
                 label="Sign in"
                 loading={isSubmitting}

diff --git a/src/pages/login/UserSelectExisting.tsx b/src/pages/login/UserSelectExisting.tsx
@@ -80,6 +80,7 @@ const UserSelectExisting = () => {
         </p>
         <Button
           icon={token ? faArrowRightArrowLeft : faRightFromBracket}
+          intention={token ? 'info' : 'primary'}
           label={token ? 'Switch user' : 'Sign in'}
           className="flex-1"
           onClick={() => setPathname('/login/user')}