MERMS/MermsPanelReactJS
1
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

fix text

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2025-08-31 13:57:02 -04:00
parent 373c5427c2
commit 6adb6aed1f
4 changed files with 99 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile
+3 -3
View File
@@ -126,10 +126,10 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
# add app # add app
COPY . ./ COPY . ./
# start app # start appdpvle
# CMD ["npm","run", "start"] CMD ["npm","run", "start"]
# CMD ["yarn", "start"] # CMD ["yarn", "start"]
# start app # start app
CMD /bin/sh ./run.sh # @CMD /bin/sh ./run.sh
src/component/auth/Login2.jsx
+9 -1
View File
@@ -124,10 +124,18 @@ export default function Login() {
<button type='button' onClick={()=>{login.mutate(fields)}} className="btn btn-primary text-uppercase">{login.isPending ? 'loading...' : 'Sign In'}</button> <button type='button' onClick={()=>{login.mutate(fields)}} className="btn btn-primary text-uppercase">{login.isPending ? 'loading...' : 'Sign In'}</button>
</div> </div>
<div className="col-12 mt-3"> <div className="col-12 mt-3">
<p>Don't have an account ?<Link to={siteLinks.signup}><span style={{fontWeight: 'bolder'}}>Sign Up</span></Link></p> <p> <Link to={siteLinks.signup}>
{/*<span style={{fontWeight: 'bolder'}}>Sign Up</span>*/}
<button className="btn btn-warning text-uppercase">
Sign Up
</button>
</Link><span style={{paddingLeft: '5px' , fontWeight: 'bolder'}}> if you don't have an account yet.</span></p>
</div> </div>
</div> </div>
</form> </form>
<div className="row" style={{margin: '5px'}}>
<hr />
</div>
<div className="row" style={{marginTop: '20px'}}> <div className="row" style={{marginTop: '20px'}}>
<div className="col-6"> <div className="col-6">
<div className="app-store-icons-wrap text-center"> <div className="app-store-icons-wrap text-center">
src/component/auth/Signup.jsx
+31 -22
View File
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react' import React, {useEffect, useState} from 'react'
import LoginImg from '../../assets/bg/login.svg' import LoginImg from '../../assets/bg/login.svg'
import MainLoader from '../loaders/MainLoader' import MainLoader from '../loaders/MainLoader'
import { Link, useNavigate } from 'react-router-dom' import {Link, useNavigate} from 'react-router-dom'
import siteLinks from '../../links/siteLinks' import siteLinks from '../../links/siteLinks'
import Label from '../Label' import Label from '../Label'
import TextInput from '../inputs/TextInput' import TextInput from '../inputs/TextInput'
@@ -13,13 +13,13 @@ export default function Signup() {
const navigate = useNavigate() const navigate = useNavigate()
useEffect(()=>{ useEffect(() => {
const timer = setTimeout(()=>{ const timer = setTimeout(() => {
setLoading(false) setLoading(false)
},1000) }, 1000)
return () => clearTimeout(timer) return () => clearTimeout(timer)
},[]) }, [])
return ( return (
<div className="h-screen bg-white w-full flex justify-center items-center"> <div className="h-screen bg-white w-full flex justify-center items-center">
@@ -35,59 +35,68 @@ export default function Signup() {
<div className='w-full grid grid-cols-2 gap-8'> <div className='w-full grid grid-cols-2 gap-8'>
<div className="w-full"> <div className="w-full">
<div className="w-full flex flex-col gap-2"> <div className="w-full flex flex-col gap-2">
<Label desc='First Name*' /> <Label desc='First Name*'/>
<TextInput type='text' placeholder='Firstname' /> <TextInput type='text' placeholder='Firstname'/>
</div> </div>
</div> </div>
<div className="w-full"> <div className="w-full">
<div className="w-full flex flex-col gap-2"> <div className="w-full flex flex-col gap-2">
<Label desc='Last Name*' /> <Label desc='Last Name*'/>
<TextInput type='text' placeholder='Lastname' /> <TextInput type='text' placeholder='Lastname'/>
</div> </div>
</div> </div>
</div> </div>
<div className="w-full"> <div className="w-full">
<div className="w-full flex flex-col gap-2"> <div className="w-full flex flex-col gap-2">
<Label desc='Email*' /> <Label desc='Email*'/>
<TextInput type='text' placeholder='Email' /> <TextInput type='text' placeholder='Email'/>
</div> </div>
</div> </div>
<div className="w-full"> <div className="w-full">
<div className="w-full flex flex-col gap-2"> <div className="w-full flex flex-col gap-2">
<Label desc='User Name*' /> <Label desc='User Name*'/>
<TextInput type='text' placeholder='Username' /> <TextInput type='text' placeholder='Username'/>
</div> </div>
</div> </div>
<div className="w-full"> <div className="w-full">
<div className="w-full flex flex-col gap-2"> <div className="w-full flex flex-col gap-2">
<Label desc='Password*' /> <Label desc='Password*'/>
<TextInput type='password' placeholder='Password' /> <TextInput type='password' placeholder='Password'/>
</div> </div>
</div> </div>
<div className="w-full text-left"> <div className="w-full text-left">
<div className="flex justify-between items-center"> <div className="flex justify-between items-center">
<div className="flex gap-2"> <div className="flex gap-2">
<input className="form-check-input" type="checkbox" id="gridCheck" /> <input className="form-check-input" type="checkbox" id="gridCheck"/>
<label className="font-semibold form-check-label" htmlFor="gridCheck"> <label className="font-semibold form-check-label" htmlFor="gridCheck">
I accept terms & policy I accept terms & policy of use.
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<div className="w-full mt-3"> <div className="w-full mt-3">
<button onClick={()=>{navigate(siteLinks.home)}} className="bg-primary rounded-sm px-4 py-2 text-white font-medium uppercase">Sign Up</button> <button onClick={() => {
navigate(siteLinks.home)
}} className="bg-primary rounded-sm px-4 py-2 text-white font-medium uppercase">Sign
Up
</button>
</div> </div>
<div className="mt-3"> <div className="mt-3">
<p className='font-medium'>Already have an account ?<Link to={siteLinks.login} className=' hover:text-primary'> Sign In</Link></p> <p className='font-medium'>Already have an account ?
<Link to={siteLinks.login}
className='hover:text-primary font-bold'> Sign In
</Link>
</p>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<div className="bg-login_gradient h-full col-span-1 lg:col-span-3 xl:col-span-6 place-content-center order-1 sm:order-2"> <div
className="bg-login_gradient h-full col-span-1 lg:col-span-3 xl:col-span-6 place-content-center order-1 sm:order-2">
<div className="w-full"> <div className="w-full">
<div className="w-2/3 mx-auto"> <div className="w-2/3 mx-auto">
<img className="w-[80%]" src={LoginImg} alt="" /> <img className="w-[80%]" src={LoginImg} alt=""/>
</div> </div>
</div> </div>
</div> </div>
src/component/layout/layoutcom/UserMenu.jsx
+1 -1
View File
@@ -31,7 +31,7 @@ export default function UserMenu() {
<li className={`${pathname == siteLinks.dash ? 'active' : ''}`}><Link to={siteLinks.dash}>Home</Link></li> <li className={`${pathname == siteLinks.dash ? 'active' : ''}`}><Link to={siteLinks.dash}>Home</Link></li>
<li className={`${pathname == siteLinks.calendar ? 'active' : ''}`}><Link to={siteLinks.calendar}>Calendar</Link></li> <li className={`${pathname == siteLinks.calendar ? 'active' : ''}`}><Link to={siteLinks.calendar}>Calendar</Link></li>
<li className={`${pathname == siteLinks.contacts ? 'active' : ''}`}><Link to={siteLinks.contacts}>Sites Contacts</Link></li> <li className={`${pathname == siteLinks.contacts ? 'active' : ''}`}><Link to={siteLinks.contacts}>Sites Contacts</Link></li>
<li className={`${pathname == siteLinks.comments ? 'active' : ''}`}><Link to={siteLinks.comments}>Sites Comments</Link></li> <li className={`${pathname == siteLinks.comments ? 'active' : ''}`}><Link to={siteLinks.comments}>Comments</Link></li>
</ul> </ul>
</li> </li>
<li className={`${pathname == siteLinks.reports ? 'active' : ''}`}> <li className={`${pathname == siteLinks.reports ? 'active' : ''}`}>