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.

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

Feature/auth page and Dev mode #21

Open
wants to merge 38 commits into
base: demo
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
87d4f87
Feat:implement DevModeSwitch and LogInButton
gotovvar Mar 6, 2024
1958610
feat: add DevModeSwitch
gotovvar Mar 12, 2024
c9d0834
DivMode state moved from Redux to localStorage
gotovvar Mar 12, 2024
4c9ea48
feat(DevModeSwitch): add props to DevModeSwitch
Daer0n Mar 12, 2024
84dba42
Dev
kitanoyoru Mar 13, 2024
b33cd1e
Styles
kitanoyoru Mar 13, 2024
def7beb
Dev
kitanoyoru Mar 13, 2024
f98144c
Dev
kitanoyoru Mar 13, 2024
bd19df8
Dev
kitanoyoru Mar 20, 2024
9f3fab0
feat: add Tooltip
gotovvar Mar 24, 2024
8bfade4
feat: added tooltip for interface components
gotovvar Mar 29, 2024
e8fec08
feat: added context menu for components
gotovvar Mar 29, 2024
3daeb61
added tooltip for sections
gotovvar Mar 31, 2024
b03a869
added tooltip for SCn
gotovvar Mar 31, 2024
3c0852a
feat: added tooltip for SCn
gotovvar Mar 31, 2024
89930bf
feat: added tooltip for scg and scn icons
gotovvar Mar 31, 2024
acc4873
Merge branch 'feature/dev-mode' of github.com:ostis-ai/react-sc-web i…
gotovvar Mar 31, 2024
b61af7e
Dev
kitanoyoru Apr 4, 2024
a9c6013
Merge branch 'main' into feature/auth-page
kitanoyoru Apr 4, 2024
8213355
feat: added tooltip logic for devmode
gotovvar Apr 5, 2024
d6c360b
Fixes before review
kitanoyoru Apr 8, 2024
83df7f5
Fix styles
kitanoyoru Apr 9, 2024
31cf599
Merge branch 'main' of github.com:ostis-ai/react-sc-web into feature/…
gotovvar Apr 10, 2024
abac23a
fix:Removed autofocus for search
gotovvar Apr 12, 2024
68b7e3a
fix: rename systemId for some components and changed receiving addres…
gotovvar Apr 14, 2024
995aeeb
Fix submit translate issue and refactor auth redux slice
kitanoyoru Apr 15, 2024
df5a7b3
Patch .gitignore
kitanoyoru Apr 15, 2024
8c43014
feat(layout): add logo
kitanoyoru Apr 15, 2024
7d6542c
Merge with DevMode branch and some refactor
kitanoyoru Apr 15, 2024
462a65b
refactor: z-index value changed
gotovvar Apr 15, 2024
389b83c
Fix
kitanoyoru Apr 16, 2024
d1fde63
Gitignore
kitanoyoru Apr 16, 2024
ae5c4b4
Merge branch 'feature/dev-mode' into feature/auth-page
kitanoyoru Apr 16, 2024
bf502a0
Remove formatting
kitanoyoru Apr 16, 2024
0960417
Logout component on click
kitanoyoru Apr 17, 2024
ca542ea
Logout component on click
kitanoyoru Apr 17, 2024
0352eba
Styles
kitanoyoru Apr 17, 2024
6e7bd5c
Merge branch 'demo' into feature/auth-page
MksmOrlov Apr 17, 2024
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
Merge branch 'demo' into feature/auth-page
  • Loading branch information
MksmOrlov authored Apr 17, 2024
commit 6e7bd5cdc74f4f144058be45ed6ce7b6add47838
1 change: 1 addition & 0 deletions src/components/Router/Router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Main } from '@pages/Main';
import { Question } from '@pages/Question';
import { Auth } from '@pages/Auth';
import { AuthLayout } from '@components/Layout/AuthLayout';
import { Library } from '@pages/Library'

export const Router = () => {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/components/SidePanel/SidePanel.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import classNames from 'classnames';
import { useDecompositionContext, useTranslate } from 'ostis-ui-lib';
import { DecompositionPanel } from '@components/DecompositionPanel';
import { DecompositionPanel, Scn, useDecompositionContext, useTranslate } from 'ostis-ui-lib';
import { FC, useEffect, useState } from 'react';
import { useDispatch } from 'react-redux';
import { getHistory } from '@api/requests/userHistory';
Expand All @@ -17,6 +16,7 @@ import { selectRequests, setRequests } from '@store/requestHistorySlice';
import styles from './SidePanel.module.scss';
import { selectAuth } from '@store/authSlice';
import { Tooltip } from '@components/ToolTip/ToolTip';
import { SwitchMode } from './SwitchMode';

interface IProps {
className?: string;
Expand Down
2 changes: 2 additions & 0 deletions src/constants/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ export const MAIN = '/' as const;
export const COMMAND = '/c/:commandAddr/a/:addr/:format' as const;
export const QUESTION = '/q/:question/:format' as const;
export const AUTH = '/auth' as const;
export const LIBRARY = '/l/' as const;
export const ASK_AI = '/c/' as const;
You are viewing a condensed version of this merge commit. You can view the full changes here.