Remove Satoshi from template, keep it in opensaas.sh (#526)

opensaas-sh/app_diff/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx.diff

@@ -0,0 +1,11 @@
+--- template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
++++ opensaas-sh/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
+@@ -11,7 +11,7 @@
+   },
+   colors: ["#3C50E0", "#80CAEE"],
+   chart: {
+-    fontFamily: "system-ui, sans-serif",
++    fontFamily: "Satoshi, system-ui, sans-serif",
+     height: 335,
+     type: "area",
+     dropShadow: {

opensaas-sh/app_diff/src/client/Main.css.diff

@@ -1,6 +1,6 @@
 --- template/app/src/client/Main.css
 +++ opensaas-sh/app/src/client/Main.css
-@@ -56,6 +56,23 @@
+@@ -56,6 +56,64 @@
    .border-gradient-primary > * {
      background: hsl(var(--background));
    }
@@ -21,13 +21,7 @@
 +      hsl(var(--card)) 100%
 +    );
 +  }
- }
++}
- 
- /* Here is an example of how to add a custom font. 
-@@ -63,6 +80,16 @@
- * They are defined first here, then need to be referenced in the tailwind.config.js file
- * under `theme.extend.fontFamily`, and then can be used as a tailwind class, e.g. className='font-satoshi'.
- */
 +
 +/* Satoshi Font Family */
 +@font-face {
@@ -38,13 +32,14 @@
 +  font-display: swap;
 +}
 +
- @font-face {
++@font-face {
-   font-family: "Satoshi";
++  font-family: "Satoshi";
-   src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
++  src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
-@@ -71,6 +98,30 @@
++  font-weight: normal;
-   font-display: swap;
++  font-style: normal;
- }
++  font-display: swap;
- 
++}
++
 +@font-face {
 +  font-family: "Satoshi";
 +  src: url("/fonts/Satoshi-Medium.woff2") format("woff2");
@@ -67,12 +62,10 @@
 +  font-weight: 900;
 +  font-style: normal;
 +  font-display: swap;
-+}
+ }
-+
- /* third-party libraries CSS */
  
- .tableCheckbox:checked ~ div span {
+ /* third-party libraries CSS */
-@@ -189,4 +240,22 @@
+@@ -176,4 +234,22 @@
    body {
      @apply bg-background text-foreground;
    }

opensaas-sh/app_diff/tailwind.config.js.diff

@@ -1,6 +1,16 @@
 --- template/app/tailwind.config.js
 +++ opensaas-sh/app/tailwind.config.js
-@@ -254,6 +254,10 @@
+@@ -12,6 +12,9 @@
+   darkMode: "class",
+   theme: {
+     extend: {
++      fontFamily: {
++        satoshi: ["Satoshi", "system-ui", "sans-serif"],
++      },
+       colors: {
+         current: "currentColor",
+         transparent: "transparent",
+@@ -251,6 +254,10 @@
          7: "-5px 0 0 #313D4A, 5px 0 0 #313D4A",
          8: "1px 0 0 #313D4A, -1px 0 0 #313D4A, 0 1px 0 #313D4A, 0 -1px 0 #313D4A, 0 3px 13px rgb(0 0 0 / 8%)",
          default: "0px 8px 13px -3px rgba(0, 0, 0, 0.07)",

template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx

@@ -11,7 +11,7 @@ const options: ApexOptions = {
   },
   colors: ["#3C50E0", "#80CAEE"],
   chart: {
-    fontFamily: "Satoshi, sans-serif",
+    fontFamily: "system-ui, sans-serif",
     height: 335,
     type: "area",
     dropShadow: {

template/app/src/client/Main.css

@@ -58,19 +58,6 @@
   }
 }
 
-/* Here is an example of how to add a custom font. 
-* Fonts are stored in the public/fonts folder.
-* They are defined first here, then need to be referenced in the tailwind.config.js file
-* under `theme.extend.fontFamily`, and then can be used as a tailwind class, e.g. className='font-satoshi'.
-*/
-@font-face {
-  font-family: "Satoshi";
-  src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
-  font-weight: normal;
-  font-style: normal;
-  font-display: swap;
-}
-
 /* third-party libraries CSS */
 
 .tableCheckbox:checked ~ div span {

template/app/tailwind.config.js

@@ -12,9 +12,6 @@ export default {
   darkMode: "class",
   theme: {
     extend: {
-      fontFamily: {
-        satoshi: ["Satoshi", "system-ui", "sans-serif"],
-      },
       colors: {
         current: "currentColor",
         transparent: "transparent",