@campxdev/shared 1.8.0 → 1.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/components/ExcelToJsonInput/ExcelJsonUpload.tsx

@@ -41,8 +41,8 @@ export default function ExcelJsonUpload({
         Submit Data
       </Button>
       <ExcelToJsonInput
-        onChange={() => {
-          setJson(json)
+        onChange={(jsonValue) => {
+          setJson(jsonValue)
         }}
       />
     </Box>

package/src/components/LoginForm.tsx

@@ -18,8 +18,16 @@ import { FormTextField } from './HookForm'
 import axios from '../config/axios'
 import ResetPassword from './ResetPassword'
 import { Link } from 'react-router-dom'
+import { DialogButton } from './ModalButtons'
+import adminAxios from '../utils/adminAxios'
 
-export function LoginForm({ loginUrl }: { loginUrl?: string }) {
+export function LoginForm({
+  loginUrl,
+  showSuperAdminForm,
+}: {
+  loginUrl?: string
+  showSuperAdminForm?: boolean
+}) {
   const [showPassword, setShowPassword] = useState(false)
   const [forgotMail, setForgotMail] = useState(null)
   const [forgotPassword, setForgotPassword] = useState(true)
@@ -72,7 +80,7 @@ export function LoginForm({ loginUrl }: { loginUrl?: string }) {
   }, [])
 
   return (
-    <>
+    <Box sx={{ position: 'relative', height: '100%' }}>
       {resetPassword ? (
         <>
           <ResetPassword />
@@ -80,37 +88,33 @@ export function LoginForm({ loginUrl }: { loginUrl?: string }) {
       ) : forgotPassword ? (
         <form onSubmit={handleSubmit(onSubmit)}>
           <Stack gap={'30px'} sx={{ display: resetPassword ? 'none' : 'flex' }}>
-            <Box>
-              <FormTextField
-                control={control}
-                name="username"
-                label="User ID"
-                required
-              />
-            </Box>
-            <Box>
-              <FormTextField
-                control={control}
-                name="password"
-                label="Password"
-                type={showPassword ? 'text' : 'password'}
-                required
-                InputProps={{
-                  endAdornment: (
-                    <InputAdornment position="end">
-                      <IconButton
-                        size="small"
-                        aria-label="toggle password visibility"
-                        onClick={() => setShowPassword((prev) => !prev)}
-                        edge="end"
-                      >
-                        {showPassword ? <VisibilityOff /> : <Visibility />}
-                      </IconButton>
-                    </InputAdornment>
-                  ),
-                }}
-              />
-            </Box>
+            <FormTextField
+              control={control}
+              name="username"
+              label="User ID"
+              required
+            />
+            <FormTextField
+              control={control}
+              name="password"
+              label="Password"
+              type={showPassword ? 'text' : 'password'}
+              required
+              InputProps={{
+                endAdornment: (
+                  <InputAdornment position="end">
+                    <IconButton
+                      size="small"
+                      aria-label="toggle password visibility"
+                      onClick={() => setShowPassword((prev) => !prev)}
+                      edge="end"
+                    >
+                      {showPassword ? <VisibilityOff /> : <Visibility />}
+                    </IconButton>
+                  </InputAdornment>
+                ),
+              }}
+            />
             <ActionButton type="submit">Login</ActionButton>
             <Typography
               variant="h6"
@@ -159,7 +163,27 @@ export function LoginForm({ loginUrl }: { loginUrl?: string }) {
           {error}
         </Alert>
       )}
-    </>
+
+      {showSuperAdminForm && (
+        <Box
+          sx={{
+            position: 'absolute',
+            bottom: '20px',
+            right: '20px',
+          }}
+        >
+          <DialogButton
+            title="Super Admin Login"
+            anchor={({ open }) => (
+              <Button onClick={open} size="small" variant="text">
+                Super Admin Login
+              </Button>
+            )}
+            content={({ close }) => <SuperAdminLoginForm close={close} />}
+          />
+        </Box>
+      )}
+    </Box>
   )
 }
 
@@ -169,3 +193,82 @@ export const StyledLink = styled(Link)({
 })
 
 export default LoginForm
+
+const SuperAdminLoginForm = ({ close }) => {
+  const [showPassword, setShowPassword] = useState(false)
+  const [loading, setLoading] = useState(false)
+  const { handleSubmit, control } = useForm({
+    defaultValues: null,
+  })
+  const [error, setError] = useState('')
+
+  const onSubmit = async (values) => {
+    setLoading(true)
+    try {
+      const res = await adminAxios.post(`/auth/login`, values)
+      Cookies.set('campx_admin_session_key', res?.data?.cookie)
+
+      setLoading(false)
+      window.location.href = '/campx'
+    } catch (err) {
+      setLoading(false)
+      setError(err.response.data.message ?? 'Server Error')
+    }
+  }
+
+  const onError = (e) => {
+    console.log(e)
+  }
+
+  return (
+    <Box width={'100%'} marginTop="20px">
+      <form onSubmit={handleSubmit(onSubmit, onError)}>
+        <Stack gap={'40px'}>
+          <Typography variant="h6" textAlign={'center'}>
+            Sign in to Super Admin Account
+          </Typography>
+          <FormTextField
+            control={control}
+            name="username"
+            label="Username/Email"
+            required
+          />
+          <FormTextField
+            control={control}
+            name="password"
+            label="Password"
+            type={showPassword ? 'text' : 'password'}
+            required
+            InputProps={{
+              endAdornment: (
+                <InputAdornment position="end">
+                  <IconButton
+                    size="small"
+                    aria-label="toggle password visibility"
+                    onClick={() => setShowPassword((prev) => !prev)}
+                    edge="end"
+                  >
+                    {showPassword ? <VisibilityOff /> : <Visibility />}
+                  </IconButton>
+                </InputAdornment>
+              ),
+            }}
+          />
+          <ActionButton
+            type="submit"
+            fullWidth
+            disabled={loading}
+            loading={loading}
+          >
+            Login
+          </ActionButton>
+        </Stack>
+      </form>
+      {error && (
+        <Alert severity="error" sx={{ marginTop: '20px' }}>
+          {error}
+        </Alert>
+      )}
+    </Box>
+  )
+}

package/src/constants/isDevelopment.ts

@@ -1,3 +1,4 @@
 const urlTenantKey = window.location.pathname.split('/')[1]
 export const isDevelopment =
-  process.env.NODE_ENV === 'development' || urlTenantKey === 'campx_dev'
+  process.env.NODE_ENV === 'development' ||
+  window.location.origin.split('campx')[1] === '.dev'

package/src/contexts/LoginFormProvider.tsx

@@ -8,14 +8,19 @@ const LoginContext = createContext<{
   openLoginForm: (loginUrl: string) => {},
 })
 
-export default function LoginFormProvider({ children }) {
+export default function LoginFormProvider({ children, showSuperAdminForm }) {
   const modal = useModal()
 
   const onLogin = (loginUrl: string) => {
     modal({
       title: 'Developer Login',
       content({ close }) {
-        return <LoginForm loginUrl={loginUrl} />
+        return (
+          <LoginForm
+            loginUrl={loginUrl}
+            showSuperAdminForm={showSuperAdminForm}
+          />
+        )
       },
     })
   }

package/src/contexts/Providers.tsx

@@ -13,7 +13,13 @@ import LoginFormProvider from './LoginFormProvider'
 export const campxTenantKey = Cookies.get('campx_tenant')
 export const urlTenantKey = window.location.pathname.split('/')[1]
 
-export default function Providers({ children }: { children: ReactNode }) {
+export default function Providers({
+  children,
+  showSuperAdminLoginForm = false,
+}: {
+  children: ReactNode
+  showSuperAdminLoginForm?: boolean
+}) {
   useEffect(() => {
     if (!urlTenantKey) {
       if (campxTenantKey) {
@@ -30,7 +36,7 @@ export default function Providers({ children }: { children: ReactNode }) {
         <MuiThemeProvider>
           <ConfirmContextProvider>
             <DialogProvider>
-              <LoginFormProvider>
+              <LoginFormProvider showSuperAdminForm={showSuperAdminLoginForm}>
                 {children}
                 <GlobalNetworkLoadingIndicator />
               </LoginFormProvider>

package/src/shared-state/PermissionsStore.ts

@@ -21,6 +21,8 @@ export enum Permission {
   CLASSROOM_EDIT = 'can_classroom_edit',
   CLASSROOM_DELETE = 'can_classroom_delete',
   CLASSROOM_ADD = 'can_classroom_add',
+  CAN_CLASSROOM_SUBJECTS_VIEW = 'can_classroom_subjects_view',
+  CAN_CLASSROOM_SUBJECT_ATTENDANCE_EDIT = 'can_classroom_subject_attendance_edit',
 
   // Tasks
 
@@ -341,6 +343,8 @@ export interface IPermissions {
   can_tasks_edit: boolean
   can_tasks_change_status: boolean
   can_tasks_delete: boolean
+  can_classroom_subject_attendance_edit: boolean
+  can_classroom_subjects_view: boolean
 }
 
 interface IPermissionsStore {

package/src/utils/adminAxios.ts

@@ -0,0 +1,15 @@
+import Axios from 'axios'
+import Cookies from 'js-cookie'
+
+const sessionKey = Cookies.get('campx_admin_session_key')
+let adminAxios = Axios.create({
+  baseURL: process.env.REACT_APP_TENANT_API_HOST,
+  withCredentials: true,
+  headers: {
+    ...(sessionKey && {
+      campx_admin_session_key: sessionKey,
+    }),
+  },
+})
+
+export default adminAxios

package/src/utils/logout.ts

@@ -1,8 +1,6 @@
 import Cookies from 'js-cookie'
 import axios, { axiosErrorToast } from '../config/axios'
 
-const urlTenantKey = window.location.pathname.split('/')[1]
-
 export default function logout() {
   axios({
     method: 'POST',
@@ -10,14 +8,13 @@ export default function logout() {
     url: '/auth-server/auth/logout',
   })
     .then((res) => {
-      if (process.env.NODE_ENV === 'development') {
+      if (
+        process.env.NODE_ENV === 'development' ||
+        window.location.origin.split('campx')[1] === '.dev'
+      ) {
         Cookies.remove('campx_tenant')
         Cookies.remove('campx_session_key')
-        if (!urlTenantKey) {
-          window.location.href = window.location.origin + 'campx_dev'
-        } else {
-          window.location.href = window.location.origin + `/${urlTenantKey}`
-        }
+        window.location.href = window.location.origin
       } else {
         window.location.href = 'https://id.campx.in'
       }