Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI/UX and backend changes in the plugin #645

Merged
merged 5 commits into from
Jan 20, 2025
Merged

UI/UX and backend changes in the plugin #645

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f55954
feat: add new uli_community directory
maanasb01 Jan 7, 2025
a05b3e1
chore: add additional file for setup uli_comm
maanasb01 Jan 7, 2025
d685d93
feat: modify slur list ui & let un-registered user use some features
maanasb01 Jan 16, 2025
d548525
replace checkboxes with radio buttons
maanasb01 Jan 16, 2025
5cefea4
add login ui and turn off option
maanasb01 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: modify slur list ui & let un-registered user use some features
  • Loading branch information
@maanasb01
maanasb01 committed Jan 16, 2025
commit d685d93499ee508585f71fd93178bbdc08fd144b
131 changes: 71 additions & 60 deletions browser-extension/plugin/src/ui-components/pages/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ import { useTranslation } from 'react-i18next';
import Theme from '../atoms/Theme';
import { Link, Routes, Route, useNavigate } from 'react-router-dom';
import { Debug } from './Debug';
import { Preferences } from './Preferences';
import {
Preferences,
PreferencesHome,
PreferencesSlurList
} from './Preferences';
import { Resources } from './Resources';
import { Archive } from './Archive';
import '../atoms/i18n';
Expand Down Expand Up @@ -43,25 +47,38 @@ export function App() {
try {
const userData = await getUserData();
const preferenceData = await getPreferenceData();

if(!ignore) {
if (userData != undefined && Object.keys(userData).length !== 0) {

if (!ignore) {
if (
userData != undefined &&
Object.keys(userData).length !== 0
) {
setUser(userData);
} else {
setUser(null);
await setUserData(user)
}

if (preferenceData != undefined) {
const { language } = preferenceData;
i18n.changeLanguage(langNameMap[language]);

navigate('/preferences');
}
} else {
await setPreferenceData({
enableSlurReplacement: true,
enableSlurMetadata: false,
language: 'English'
});
i18n.changeLanguage(langNameMap["English"]);
}
navigate('/preferences');
}
} catch (error) {
console.error('Error in useEffect:', error);
}
}
}
let ignore = false;
navigatePreferences();

return () => {
ignore = true;
};
Expand Down Expand Up @@ -137,71 +154,65 @@ export function App() {
) : null}
</Box>

{user ? (
<div>
<Box direction="row" gap={'medium'}>
<Link
id="app_nav_preference"
to="/preferences"
>
{t('navigation_preferences')}
</Link>
<Link id="app_nav_archive" to="/archive">
{/* {user ? ( */}
<div>
<Box direction="row" gap={'medium'}>
<Link id="app_nav_preference" to="/preferences">
{t('navigation_preferences')}
</Link>
{/* <Link id="app_nav_archive" to="/archive">
{t('navigation_archive')}
</Link>
<Link
id="app_nav_resources"
to="/resources"
>
{t('navigation_resources')}
</Link>
<Link to="/debug">
{t('navigation_debug')}
</Link>
<Link id="slur-link" to="/slur">
{t('navigation_slur_list')}
</Link>
</Box>
</Link> */}
<Link id="app_nav_resources" to="/resources">
{t('navigation_resources')}
</Link>
<Link to="/debug">{t('navigation_debug')}</Link>
<Link id="slur-link" to="/slur">
{t('navigation_slur_list')}
</Link>
</Box>

<Box height={'2.0em'} />
<Box height={'2.0em'} />

<Routes>
<Route></Route>
<Route
exact
path="/preferences"
element={<Preferences />}
/>
<Route
path="archive"
element={<Archive />}
/>
<Route
path="resources"
element={<Resources />}
/>
<Route path="debug" element={<Debug />} />
<Route path="off" element={<Off />} />
<Route path="slur" element={<Slur />} />
<Routes>
<Route
exact
path="preferences"
element={<Preferences />}
>
<Route
path="slur/create"
element={<SlurCreate />}
path=""
element={<PreferencesHome />}
/>
<Route
path="slur/:id"
element={<SlurEdit />}
path="slur-list"
element={<PreferencesSlurList />}
/>
</Routes>
</div>
) : (
</Route>
<Route path="archive" element={<Archive />} />
<Route
path="resources"
element={<Resources />}
/>
<Route path="debug" element={<Debug />} />
<Route path="off" element={<Off />} />
<Route path="slur" element={<Slur />} />
<Route
path="slur/create"
element={<SlurCreate />}
/>
<Route path="slur/:id" element={<SlurEdit />} />
</Routes>
</div>
{/* ) : (
<Box>
<Button
id="app_btn_activate"
label={t('activate_account')}
onClick={clickActivateAccount}
></Button>
</Box>
)}
)} */}
</Box>
</NotificationContext.Provider>
</UserContext.Provider>
Expand Down
Loading
Loading