studio: init shadcn ts vite

docker-compose.yml

@@ -273,14 +273,14 @@ services:
       args:
         - CACHEBUST
     environment:
-      - PUBLIC_URL=http://127.0.0.1:3000
+      - PUBLIC_URL=http://127.0.0.1:5173
       - REACT_APP_SACH_API_URL=https://sach-server.factly.in
-      - WDS_SOCKET_HOST=127.0.0.1
+      - VITE_WS_HOST=127.0.0.1
       - CHOKIDAR_USEPOLLING=true
       - WATCHPACK_POLLING=true
       - NODE_ENV=development
     ports:
-      - "3000:3000"
+      - "5173:5173"
     volumes:
       - type: bind
         source: ./studio

server/service/route.go

@@ -44,7 +44,7 @@ func RegisterRoutes() http.Handler {
 
 	if viper.IsSet("mode") && viper.GetString("mode") == "development" {
 		r.Use(cors.Handler(cors.Options{
-			AllowedOrigins:   []string{"http://localhost:3000"},
+			AllowedOrigins:   []string{"http://localhost:3000", "http://localhost:5173"},
 			AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 			AllowedHeaders:   []string{"*"},
 			ExposedHeaders:   []string{"*"},

server/util/scooter.go

@@ -2,6 +2,8 @@ package util
 
 import (
 	"encoding/json"
+	"errors"
+	"strings"
 
 	"github.com/jinzhu/gorm/dialects/postgres"
 )
@@ -11,20 +13,47 @@ type Description struct {
 	JSON postgres.Jsonb
 }
 
+func hasKeyCaseInsensitive(data map[string]json.RawMessage, key string) bool {
+	for k := range data {
+		if strings.EqualFold(k, key) {
+			return true
+		}
+	}
+	return false
+}
+
 func GetDescriptionHTML(jsonData postgres.Jsonb) (string, error) {
+	var raw map[string]json.RawMessage
+	if err := json.Unmarshal(jsonData.RawMessage, &raw); err != nil {
+		return "", err
+	}
+
+	if !hasKeyCaseInsensitive(raw, "html") || !hasKeyCaseInsensitive(raw, "json") {
+		return "", errors.New("missing required fields 'html' or 'json'")
+	}
+
 	var description Description
-	err := json.Unmarshal(jsonData.RawMessage, &description)
-	if err != nil {
+	if err := json.Unmarshal(jsonData.RawMessage, &description); err != nil {
 		return "", err
 	}
+
 	return description.HTML, nil
 }
 
 func GetJSONDescription(jsonData postgres.Jsonb) (postgres.Jsonb, error) {
+	var raw map[string]json.RawMessage
+	if err := json.Unmarshal(jsonData.RawMessage, &raw); err != nil {
+		return postgres.Jsonb{}, err
+	}
+
+	if !hasKeyCaseInsensitive(raw, "html") || !hasKeyCaseInsensitive(raw, "json") {
+		return postgres.Jsonb{}, errors.New("missing required fields 'html' or 'json'")
+	}
+
 	var description Description
-	err := json.Unmarshal(jsonData.RawMessage, &description)
-	if err != nil {
+	if err := json.Unmarshal(jsonData.RawMessage, &description); err != nil {
 		return postgres.Jsonb{}, err
 	}
+
 	return description.JSON, nil
 }

studio/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

studio/Dockerfile

@@ -1,18 +1,20 @@
-# pull official base image
+# Use Node.js LTS version
 FROM node:18-alpine
 
-# set working directory
-ARG CACHEBUST=100
-
+# Set working directory
 WORKDIR /app
 
-# install app dependencies
-COPY package.json ./
-COPY package-lock.json ./
+# Copy package files
+COPY package.json package-lock.json* ./
+
+# Install dependencies
 RUN npm install --legacy-peer-deps
 
-# add app
-COPY . ./
-EXPOSE 3000
-# start app
-CMD ["npm", "start"]
+# Copy all files
+COPY . .
+
+# Expose Vite's default port
+EXPOSE 5173
+
+# Start Vite development server with host flag
+CMD ["npm", "run", "dev", "--", "--host"]

studio/Dockerfile.prod

@@ -12,7 +12,7 @@ RUN npm run build
 
 # production environment
 FROM nginx:stable-alpine
-COPY --from=build /app/build /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html
 COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

studio/README.md

@@ -1,31 +1,50 @@
-# Dega Admin Portal
-
-### Setup:
-
-Clone the repo: `git clone https://github.com/factly/dega-studio.git`<br />
-Install dependencies: `npm i`
-
-### To start the development server:<br />
-
-`npm start` from the root of the folder <br />
-Opens in [http://localhost:3000](http://localhost:3000)
-
-### To run tests:<br />
-
-`npm test`
-
-### To generate test coverage:<br />
-
-`npm test -- --coverage`<br />
-Generates a `coverage` folder. Open `index.html` in browser.
-
-### To build code for production:<br />
-
-`npm run build`<br />
-Bundles React in production mode and optimizes the build for the best performance.
-
-**Releasability:** [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=alert_status)](https://sonarcloud.io/dashboard?id=factly_dega-studio)  
-**Reliability:** [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=factly_dega-studio) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=bugs)](https://sonarcloud.io/dashboard?id=factly_dega-studio)  
-**Security:** [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=security_rating)](https://sonarcloud.io/dashboard?id=factly_dega-studio) [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=factly_dega-studio)  
-**Maintainability:** [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=factly_dega-studio) [![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=sqale_index)](https://sonarcloud.io/dashboard?id=factly_dega-studio) [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=code_smells)](https://sonarcloud.io/dashboard?id=factly_dega-studio)  
-**Other:** [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=ncloc)](https://sonarcloud.io/dashboard?id=factly_dega-studio) [![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=factly_dega-studio) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=factly_dega-studio&metric=coverage)](https://sonarcloud.io/dashboard?id=factly_dega-studio)
+# React + TypeScript + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend updating the configuration to enable type aware lint rules:
+
+- Configure the top-level `parserOptions` property like this:
+
+```js
+export default tseslint.config({
+  languageOptions: {
+    // other options...
+    parserOptions: {
+      project: ['./tsconfig.node.json', './tsconfig.app.json'],
+      tsconfigRootDir: import.meta.dirname,
+    },
+  },
+})
+```
+
+- Replace `tseslint.configs.recommended` to `tseslint.configs.recommendedTypeChecked` or `tseslint.configs.strictTypeChecked`
+- Optionally add `...tseslint.configs.stylisticTypeChecked`
+- Install [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) and update the config:
+
+```js
+// eslint.config.js
+import react from 'eslint-plugin-react'
+
+export default tseslint.config({
+  // Set the react version
+  settings: { react: { version: '18.3' } },
+  plugins: {
+    // Add the react plugin
+    react,
+  },
+  rules: {
+    // other rules...
+    // Enable its recommended rules
+    ...react.configs.recommended.rules,
+    ...react.configs['jsx-runtime'].rules,
+  },
+})
+```

studio/components.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": false,
+  "tsx": true,
+  "tailwind": {
+    "config": "",
+    "css": "src/App.css",
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  },
+  "iconLibrary": "lucide"
+}