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

Version 2.3.1 #432

Merged
merged 13 commits into from
Jul 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PORT=5005
NODE_ENV=development
VERSION=2.3.0
VERSION=2.3.1
PASSWORD=flame_password
SECRET=e02eb43d69953658c6d07311d6313f2d4467672cb881f96b29368ba1f3f4da4b
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### v2.3.1 (2023-07-23)
- Fixed bug where "Open search results in the same tab" setting was not respected if "Local search" was set as primary search provider ([#270](https://github.com/pawelmalak/flame/issues/270))
- Fixed bug where search bar had rounded input field on iOS ([#394](https://github.com/pawelmalak/flame/issues/394))
- Updated link to Material Design Icons reference page ([#414](https://github.com/pawelmalak/flame/issues/414))
- Fixed bug where color inputs in theme creator/editor were too small ([#429](https://github.com/pawelmalak/flame/issues/429))
- Changed input labels in settings for more consistent naming ([#430](https://github.com/pawelmalak/flame/issues/430))

### v2.3.0 (2022-03-25)
- Added custom theme editor ([#246](https://github.com/pawelmalak/flame/issues/246))
- Added option to set secondary search provider ([#295](https://github.com/pawelmalak/flame/issues/295))
Expand Down
2 changes: 1 addition & 1 deletion client/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
REACT_APP_VERSION=2.3.0
REACT_APP_VERSION=2.3.1
37,245 changes: 14,202 additions & 23,043 deletions client/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-dom": "^17.0.2",
"react-redux": "^7.2.6",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"react-scripts": "^5.0.1",
"redux": "^4.1.2",
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^2.4.0",
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Apps/AppForm/AppForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const AppForm = ({ modalHandler }: Props): JSX.Element => {
/>
<span>
Use icon name from MDI or pass a valid URL.
<a href="https://materialdesignicons.com/" target="blank">
<a href="https://pictogrammers.com/library/mdi/" target="blank">
{' '}
Click here for reference
</a>
Expand Down
1 change: 1 addition & 0 deletions client/src/components/SearchBar/SearchBar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
border-bottom: 2px solid var(--color-accent);
opacity: 0.5;
transition: all 0.2s;
border-radius: 0px;
}

.SearchBar:focus {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Button, SettingsHeadline, InputGroup } from '../../UI';
import { inputHandler, generalSettingsTemplate } from '../../../utility';

// Data
import { queries } from '../../../utility/searchQueries.json';
import searchQueries from '../../../utility/searchQueries.json';

// Redux
import { State } from '../../../store/reducers';
Expand All @@ -32,6 +32,8 @@ export const GeneralSettings = (): JSX.Element => {
const { updateConfig, sortApps, sortCategories, sortBookmarks } =
bindActionCreators(actionCreators, dispatch);

const queries = searchQueries.queries;

// Initial state
const [formData, setFormData] = useState<GeneralForm>(
generalSettingsTemplate
Expand Down
4 changes: 3 additions & 1 deletion client/src/components/Settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ import { ProtectedRoute } from '../Routing/ProtectedRoute';
import { Container, Headline } from '../UI';

// Data
import { routes } from './settings.json';
import clientRoutes from './settings.json';

export const Settings = (): JSX.Element => {
const routes = clientRoutes.routes;

const { isAuthenticated } = useSelector((state: State) => state.auth);

const tabs = isAuthenticated ? routes : routes.filter((r) => !r.authRequired);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-gap: 10px;
margin-bottom: 20px;
}
4 changes: 2 additions & 2 deletions client/src/components/Settings/UISettings/UISettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,9 @@ export const UISettings = (): JSX.Element => {
</select>
</InputGroup>

{/* HIDE CATEGORIES */}
{/* HIDE BOOKMARK CATEGORIES */}
<InputGroup>
<label htmlFor="hideCategories">Hide categories</label>
<label htmlFor="hideCategories">Hide bookmarks</label>
<select
id="hideCategories"
name="hideCategories"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,11 @@
}

.InputGroup input[type='color'] {
all: unset;
margin: 0;
padding: 0;
background-color: transparent;
}

.InputGroup input[type='color']:hover {
cursor: pointer;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const classes = require('./SettingsHeadline.module.css');
import classes from './SettingsHeadline.module.css';

interface Props {
text: string;
Expand Down
2 changes: 1 addition & 1 deletion client/src/utility/redirectUrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const redirectUrl = (url: string, sameTab: boolean) => {
const parsedUrl = urlParser(url)[1];

if (sameTab) {
document.location.replace(parsedUrl);
document.location.assign(parsedUrl);
} else {
window.open(parsedUrl);
}
Expand Down
8 changes: 5 additions & 3 deletions client/src/utility/searchParser.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { queries } from './searchQueries.json';
import searchQueries from './searchQueries.json';
import { SearchResult } from '../interfaces';
import { store } from '../store/store';
import { isUrlOrIp } from '.';

export const searchParser = (searchQuery: string): SearchResult => {
const queries = searchQueries.queries;

const result: SearchResult = {
isLocal: false,
isURL: false,
Expand Down Expand Up @@ -53,10 +55,10 @@ export const searchParser = (searchQuery: string): SearchResult => {

if (prefix === 'l') {
result.isLocal = true;
} else {
result.sameTab = config.searchSameTab;
}

result.sameTab = config.searchSameTab;

if (secondarySearch) {
result.secondarySearch = secondarySearch;
}
Expand Down
Loading