code_before
stringlengths 16
1.81M
| edits
stringlengths 4
328k
| next_edit
stringlengths 0
76.5k
| code_after
stringlengths 3
49.9M
| label_window
sequencelengths 4
1.81k
| instruction
stringlengths 20
51.9k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|---|---|---|
import { withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import classNames from 'classnames';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
import { renderCheckboxField, renderInputField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const filtersCatalog = require('../../helpers/filters/filters.json');
const getIconsData = (homepage, source) => ([
| </s> remove import { renderCheckboxField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form'; </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove renderCheckboxField,
</s> add CheckboxField, | import { CheckboxField, renderInputField } from '../../helpers/form'; | import { withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import classNames from 'classnames';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
import { CheckboxField, renderInputField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const filtersCatalog = require('../../helpers/filters/filters.json');
const getIconsData = (homepage, source) => ([ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Filters/Form.js |
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters)
| </s> remove export const renderCheckboxField = ({
</s> add export const CheckboxField = ({ </s> remove import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, renderInputField } from '../../helpers/form';
</s> add import { CheckboxField, renderInputField } from '../../helpers/form'; </s> remove import { renderCheckboxField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, toNumber } from '../../../helpers/form'; </s> remove checked,
</s> add | const renderCheckboxField = (
props,
) => <CheckboxField
{...props}
input={{
...props.input,
checked: props.disabled || props.input.checked,
}}
/>;
renderCheckboxField.propTypes = {
// https://redux-form.com/8.3.0/docs/api/field.md/#props
input: PropTypes.object.isRequired,
disabled: PropTypes.bool.isRequired,
};
| <use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderCheckboxField = (
props,
) => <CheckboxField
{...props}
input={{
...props.input,
checked: props.disabled || props.input.checked,
}}
/>;
renderCheckboxField.propTypes = {
// https://redux-form.com/8.3.0/docs/api/field.md/#props
input: PropTypes.object.isRequired,
disabled: PropTypes.bool.isRequired,
};
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Filters/Form.js |
const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={`${filter.id}`}
type="checkbox"
component={renderCheckboxField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
| </s> remove checked={isSelected}
</s> add </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | name={filter.id} | const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={filter.id}
type="checkbox"
component={renderCheckboxField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Filters/Form.js |
type="checkbox"
component={renderCheckboxField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>;
| </s> remove name={`${filter.id}`}
</s> add name={filter.id} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | type="checkbox"
component={renderCheckboxField}
placeholder={t(name)}
disabled={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Filters/Form.js |
|
import { toggleAllServices } from '../../../helpers/helpers';
import {
renderInputField,
renderGroupField,
renderCheckboxField,
renderServiceField,
} from '../../../helpers/form';
import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
import { FORM_NAME, SERVICES } from '../../../helpers/constants';
import './Service.css';
| </s> remove import { renderCheckboxField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, renderInputField } from '../../helpers/form';
</s> add import { CheckboxField, renderInputField } from '../../helpers/form'; </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove renderCheckboxField,
</s> add CheckboxField, | CheckboxField, | import { toggleAllServices } from '../../../helpers/helpers';
import {
renderInputField,
renderGroupField,
CheckboxField,
renderServiceField,
} from '../../../helpers/form';
import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
import { FORM_NAME, SERVICES } from '../../../helpers/constants';
import './Service.css'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/Clients/Form.js |
<div className="form__group" key={setting.name}>
<Field
name={setting.name}
type="checkbox"
component={renderCheckboxField}
placeholder={t(setting.placeholder)}
disabled={
setting.name !== 'use_global_settings'
? useGlobalSettings
: false
| </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | component={CheckboxField} | <div className="form__group" key={setting.name}>
<Field
name={setting.name}
type="checkbox"
component={CheckboxField}
placeholder={t(setting.placeholder)}
disabled={
setting.name !== 'use_global_settings'
? useGlobalSettings
: false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/Clients/Form.js |
import { Trans, useTranslation } from 'react-i18next';
import {
renderInputField,
renderRadioField,
renderCheckboxField,
toNumber,
} from '../../../../helpers/form';
import {
validateIpv4,
validateIpv6,
| </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form'; </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove import { renderCheckboxField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, renderInputField } from '../../helpers/form';
</s> add import { CheckboxField, renderInputField } from '../../helpers/form'; | CheckboxField, | import { Trans, useTranslation } from 'react-i18next';
import {
renderInputField,
renderRadioField,
CheckboxField,
toNumber,
} from '../../../../helpers/form';
import {
validateIpv4,
validateIpv6, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/Dns/Config/Form.js |
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderCheckboxField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
| </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | component={CheckboxField} | <div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={CheckboxField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/Dns/Config/Form.js |
import flow from 'lodash/flow';
import {
renderInputField,
renderCheckboxField,
renderRadioField,
toNumber,
} from '../../../helpers/form';
import {
validateIsSafePort, validatePort, validatePortQuic, validatePortTLS,
| </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, toNumber } from '../../../helpers/form'; </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove import { renderCheckboxField, renderInputField } from '../../helpers/form';
</s> add import { CheckboxField, renderInputField } from '../../helpers/form'; | CheckboxField, | import flow from 'lodash/flow';
import {
renderInputField,
CheckboxField,
renderRadioField,
toNumber,
} from '../../../helpers/form';
import {
validateIsSafePort, validatePort, validatePortQuic, validatePortTLS, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/Encryption/Form.js |
<div className="form__group form__group--settings">
<Field
name="enabled"
type="checkbox"
component={renderCheckboxField}
placeholder={t('encryption_enable')}
onChange={handleChange}
/>
</div>
<div className="form__desc">
| </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | component={CheckboxField} | <div className="form__group form__group--settings">
<Field
name="enabled"
type="checkbox"
component={CheckboxField}
placeholder={t('encryption_enable')}
onChange={handleChange}
/>
</div>
<div className="form__desc"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/Encryption/Form.js |
<div className="form__group form__group--settings">
<Field
name="force_https"
type="checkbox"
component={renderCheckboxField}
placeholder={t('encryption_redirect')}
onChange={handleChange}
disabled={!isEnabled}
/>
<div className="form__desc">
| </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | component={CheckboxField} | <div className="form__group form__group--settings">
<Field
name="force_https"
type="checkbox"
component={CheckboxField}
placeholder={t('encryption_redirect')}
onChange={handleChange}
disabled={!isEnabled}
/>
<div className="form__desc"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/Encryption/Form.js |
import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderCheckboxField, toNumber } from '../../../helpers/form';
import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants';
const getTitleForInterval = (interval, t) => {
if (interval === 0) {
return t('disabled');
| </s> remove import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, renderInputField } from '../../helpers/form';
</s> add import { CheckboxField, renderInputField } from '../../helpers/form'; </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove renderCheckboxField,
</s> add CheckboxField, | import { CheckboxField, toNumber } from '../../../helpers/form'; | import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { CheckboxField, toNumber } from '../../../helpers/form';
import { FILTERS_INTERVALS_HOURS, FORM_NAME } from '../../../helpers/constants';
const getTitleForInterval = (interval, t) => {
if (interval === 0) {
return t('disabled'); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/FiltersConfig/Form.js |
<Field
name="enabled"
type="checkbox"
modifier="checkbox--settings"
component={renderCheckboxField}
placeholder={t('block_domain_use_filters_and_hosts')}
subtitle={t('filters_block_toggle_hint')}
onChange={handleChange}
disabled={processing}
/>
| </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | component={CheckboxField} | <Field
name="enabled"
type="checkbox"
modifier="checkbox--settings"
component={CheckboxField}
placeholder={t('block_domain_use_filters_and_hosts')}
subtitle={t('filters_block_toggle_hint')}
onChange={handleChange}
disabled={processing}
/> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/FiltersConfig/Form.js |
import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderCheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
| </s> remove import { renderCheckboxField, toNumber } from '../../../helpers/form';
</s> add import { CheckboxField, toNumber } from '../../../helpers/form'; </s> remove import { renderCheckboxField, renderInputField } from '../../helpers/form';
</s> add import { CheckboxField, renderInputField } from '../../helpers/form'; </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove renderCheckboxField,
</s> add CheckboxField, </s> remove renderCheckboxField,
</s> add CheckboxField, | import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form'; | import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { CheckboxField, renderRadioField, toNumber } from '../../../helpers/form';
import { FORM_NAME, QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/LogsConfig/Form.js |
<div className="form__group form__group--settings">
<Field
name="enabled"
type="checkbox"
component={renderCheckboxField}
placeholder={t('query_log_enable')}
disabled={processing}
/>
</div>
<div className="form__group form__group--settings">
| </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | component={CheckboxField} | <div className="form__group form__group--settings">
<Field
name="enabled"
type="checkbox"
component={CheckboxField}
placeholder={t('query_log_enable')}
disabled={processing}
/>
</div>
<div className="form__group form__group--settings"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/LogsConfig/Form.js |
<div className="form__group form__group--settings">
<Field
name="anonymize_client_ip"
type="checkbox"
component={renderCheckboxField}
placeholder={t('anonymize_client_ip')}
subtitle={t('anonymize_client_ip_desc')}
disabled={processing}
/>
</div>
| </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} </s> remove component={renderCheckboxField}
</s> add component={CheckboxField} | component={CheckboxField} | <div className="form__group form__group--settings">
<Field
name="anonymize_client_ip"
type="checkbox"
component={CheckboxField}
placeholder={t('anonymize_client_ip')}
subtitle={t('anonymize_client_ip_desc')}
disabled={processing}
/>
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/components/Settings/LogsConfig/Form.js |
error: PropTypes.string,
}).isRequired,
};
export const renderCheckboxField = ({
input,
placeholder,
subtitle,
disabled,
onClick,
| </s> remove checked,
</s> add </s> remove renderCheckboxField.propTypes = {
</s> add CheckboxField.propTypes = { </s> remove name={`${filter.id}`}
</s> add name={filter.id} </s> remove import { renderCheckboxField, renderInputField } from '../../helpers/form';
</s> add import { CheckboxField, renderInputField } from '../../helpers/form'; | export const CheckboxField = ({ | error: PropTypes.string,
}).isRequired,
};
export const CheckboxField = ({
input,
placeholder,
subtitle,
disabled,
onClick, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/helpers/form.js |
subtitle,
disabled,
onClick,
modifier = 'checkbox--form',
checked,
meta: { touched, error },
}) => <>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
| </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
checked={input.checked || checked} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} /> </s> remove <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span>
</span>
</s> add <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span> </s> remove export const renderCheckboxField = ({
</s> add export const CheckboxField = ({ </s> remove renderCheckboxField.propTypes = {
</s> add CheckboxField.propTypes = { | subtitle,
disabled,
onClick,
modifier = 'checkbox--form',
meta: { touched, error },
}) => <>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/helpers/form.js |
|
meta: { touched, error },
}) => <>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
checked={input.checked || checked} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
| </s> remove <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span>
</span>
</s> add <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span> </s> remove checked,
</s> add </s> remove renderCheckboxField.propTypes = {
</s> add CheckboxField.propTypes = { </s> remove checked={isSelected}
</s> add | <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} /> | meta: { touched, error },
}) => <>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/helpers/form.js |
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
checked={input.checked || checked} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span>
</span>
</label>
{!disabled
&& touched
&& error
&& <span className="form__message form__message--error"><Trans>{error}</Trans></span>}
| </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
checked={input.checked || checked} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} /> </s> remove renderCheckboxField.propTypes = {
</s> add CheckboxField.propTypes = { </s> remove checked,
</s> add </s> remove checked={isSelected}
</s> add | <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span> | <span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
checked={input.checked || checked} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span>
</label>
{!disabled
&& touched
&& error
&& <span className="form__message form__message--error"><Trans>{error}</Trans></span>} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/helpers/form.js |
&& error
&& <span className="form__message form__message--error"><Trans>{error}</Trans></span>}
</>;
renderCheckboxField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
| </s> remove <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span>
</span>
</s> add <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span className="checkbox__label-subtitle">{subtitle}</span>}
</span>
</span> </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled}
checked={input.checked || checked} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} /> </s> remove export const renderCheckboxField = ({
</s> add export const CheckboxField = ({ </s> remove checked,
</s> add | CheckboxField.propTypes = { | && error
&& <span className="form__message form__message--error"><Trans>{error}</Trans></span>}
</>;
CheckboxField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + client: 2154 Make renderCheckboxField a controlled input | https://github.com/AdguardTeam/AdGuardHome/commit/0ae00932e94429d25995114e2ba9a82f71377d79 | client/src/helpers/form.js |
func handleTLSStatus(w http.ResponseWriter, r *http.Request) {
data := config.TLS
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return
| </s> | if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
} | func handleTLSStatus(w http.ResponseWriter, r *http.Request) {
data := config.TLS
if data.CertificateChain != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.CertificateChain))
data.CertificateChain = string(encoded)
}
if data.PrivateKey != "" {
encoded := base64.StdEncoding.EncodeToString([]byte(data.PrivateKey))
data.PrivateKey = string(encoded)
}
err := json.NewEncoder(w).Encode(&data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Failed to marshal json with TLS status: %s", err)
return | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Don't keep certificates and keys encoded with base64 in yaml config | https://github.com/AdguardTeam/AdGuardHome/commit/0aeca6bbf5b08d0f28f969162c0e5475c9ed7469 | control.go |
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode certificate chain: %s", err)
return
}
log.Printf("got certificate: %s", certPEM)
if data.PrivateKey != "" {
| </s> | data.CertificateChain = string(certPEM) | if err != nil {
httpError(w, http.StatusBadRequest, "Failed to base64-decode certificate chain: %s", err)
return
}
data.CertificateChain = string(certPEM)
log.Printf("got certificate: %s", certPEM)
if data.PrivateKey != "" { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Don't keep certificates and keys encoded with base64 in yaml config | https://github.com/AdguardTeam/AdGuardHome/commit/0aeca6bbf5b08d0f28f969162c0e5475c9ed7469 | control.go |
}
_, err = tls.X509KeyPair(certPEM, keyPEM)
if err != nil {
httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
}
}
| </s> | data.PrivateKey = string(keyPEM)
| }
data.PrivateKey = string(keyPEM)
_, err = tls.X509KeyPair(certPEM, keyPEM)
if err != nil {
httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
}
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Don't keep certificates and keys encoded with base64 in yaml config | https://github.com/AdguardTeam/AdGuardHome/commit/0aeca6bbf5b08d0f28f969162c0e5475c9ed7469 | control.go |
go 1.17
require (
github.com/AdguardTeam/dnsproxy v0.40.6
github.com/AdguardTeam/golibs v0.10.4
github.com/AdguardTeam/urlfilter v0.15.2
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.3
github.com/digineo/go-ipset/v2 v2.2.1
| </s> remove github.com/AdguardTeam/dnsproxy v0.40.6 h1:cTyzjiDrTk4vOXixLsWZ4Xjpqy6pqjTY++Tndq3bEf4=
github.com/AdguardTeam/dnsproxy v0.40.6/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 h1:DZlzFEzDV/eKJz8b+dYctAYPrQscdsvbtBc/eFU+e9U=
github.com/AdguardTeam/dnsproxy v0.41.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()
</s> add ip := proxyutil.IPFromRR(msg.Answer[0]).To16() </s> remove if len(s.conf.BogusNXDomain) > 0 {
for _, s := range s.conf.BogusNXDomain {
ip := net.ParseIP(s)
if ip == nil {
log.Error("Invalid bogus IP: %s", s)
} else {
proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, ip)
}
</s> add for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue | github.com/AdguardTeam/dnsproxy v0.41.0 |
go 1.17
require (
github.com/AdguardTeam/dnsproxy v0.41.0
github.com/AdguardTeam/golibs v0.10.4
github.com/AdguardTeam/urlfilter v0.15.2
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.2.3
github.com/digineo/go-ipset/v2 v2.2.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 1730 bogus cidr
Merge in DNS/adguard-home from 1730-bogus-cidr to master
Closes #1730.
Squashed commit of the following:
commit 0be54259ca4edb8752e9f7e5ea5104a2b51ed440
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:50:01 2022 +0300
all: imp log of changes
commit 59fb7a8c469216823ff54621ec40a4d084836132
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:46:34 2022 +0300
all: log changes
commit 9206b13dd715fdf1180d1d572d1b80024b9e6592
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:41:26 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/0b72bcc5a1f4da47fe0dfc8154e71b94dcbc4896 | go.mod |
dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
github.com/AdguardTeam/dnsproxy v0.40.6 h1:cTyzjiDrTk4vOXixLsWZ4Xjpqy6pqjTY++Tndq3bEf4=
github.com/AdguardTeam/dnsproxy v0.40.6/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
github.com/AdguardTeam/golibs v0.10.4 h1:TMBkablZC0IZOpRgg9fzAKlxxNhSN2YJq7qbgtuZ7PQ=
github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
| </s> remove github.com/AdguardTeam/dnsproxy v0.40.6
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 </s> remove ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()
</s> add ip := proxyutil.IPFromRR(msg.Answer[0]).To16() </s> remove if len(s.conf.BogusNXDomain) > 0 {
for _, s := range s.conf.BogusNXDomain {
ip := net.ParseIP(s)
if ip == nil {
log.Error("Invalid bogus IP: %s", s)
} else {
proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, ip)
}
</s> add for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue | github.com/AdguardTeam/dnsproxy v0.41.0 h1:DZlzFEzDV/eKJz8b+dYctAYPrQscdsvbtBc/eFU+e9U=
github.com/AdguardTeam/dnsproxy v0.41.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= | dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
github.com/AdguardTeam/dnsproxy v0.41.0 h1:DZlzFEzDV/eKJz8b+dYctAYPrQscdsvbtBc/eFU+e9U=
github.com/AdguardTeam/dnsproxy v0.41.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
github.com/AdguardTeam/dnsproxy v0.41.0 h1:DZlzFEzDV/eKJz8b+dYctAYPrQscdsvbtBc/eFU+e9U=
github.com/AdguardTeam/dnsproxy v0.41.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
github.com/AdguardTeam/golibs v0.10.4 h1:TMBkablZC0IZOpRgg9fzAKlxxNhSN2YJq7qbgtuZ7PQ=
github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw= | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 1730 bogus cidr
Merge in DNS/adguard-home from 1730-bogus-cidr to master
Closes #1730.
Squashed commit of the following:
commit 0be54259ca4edb8752e9f7e5ea5104a2b51ed440
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:50:01 2022 +0300
all: imp log of changes
commit 59fb7a8c469216823ff54621ec40a4d084836132
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:46:34 2022 +0300
all: log changes
commit 9206b13dd715fdf1180d1d572d1b80024b9e6592
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:41:26 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/0b72bcc5a1f4da47fe0dfc8154e71b94dcbc4896 | go.sum |
proxyConfig.UpstreamMode = proxy.UModeFastestAddr
proxyConfig.FastestPingTimeout = s.conf.FastestTimeout.Duration
}
if len(s.conf.BogusNXDomain) > 0 {
for _, s := range s.conf.BogusNXDomain {
ip := net.ParseIP(s)
if ip == nil {
log.Error("Invalid bogus IP: %s", s)
} else {
proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, ip)
}
}
}
// TLS settings
err := s.prepareTLS(&proxyConfig)
| </s> remove ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()
</s> add ip := proxyutil.IPFromRR(msg.Answer[0]).To16() </s> remove github.com/AdguardTeam/dnsproxy v0.40.6 h1:cTyzjiDrTk4vOXixLsWZ4Xjpqy6pqjTY++Tndq3bEf4=
github.com/AdguardTeam/dnsproxy v0.40.6/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 h1:DZlzFEzDV/eKJz8b+dYctAYPrQscdsvbtBc/eFU+e9U=
github.com/AdguardTeam/dnsproxy v0.41.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove github.com/AdguardTeam/dnsproxy v0.40.6
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 | for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue | proxyConfig.UpstreamMode = proxy.UModeFastestAddr
proxyConfig.FastestPingTimeout = s.conf.FastestTimeout.Duration
}
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue
}
}
// TLS settings
err := s.prepareTLS(&proxyConfig) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 1730 bogus cidr
Merge in DNS/adguard-home from 1730-bogus-cidr to master
Closes #1730.
Squashed commit of the following:
commit 0be54259ca4edb8752e9f7e5ea5104a2b51ed440
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:50:01 2022 +0300
all: imp log of changes
commit 59fb7a8c469216823ff54621ec40a4d084836132
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:46:34 2022 +0300
all: log changes
commit 9206b13dd715fdf1180d1d572d1b80024b9e6592
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:41:26 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/0b72bcc5a1f4da47fe0dfc8154e71b94dcbc4896 | internal/dnsforward/config.go |
continue
}
}
// TLS settings
err := s.prepareTLS(&proxyConfig)
| </s> remove if len(s.conf.BogusNXDomain) > 0 {
for _, s := range s.conf.BogusNXDomain {
ip := net.ParseIP(s)
if ip == nil {
log.Error("Invalid bogus IP: %s", s)
} else {
proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, ip)
}
</s> add for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue </s> remove ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()
</s> add ip := proxyutil.IPFromRR(msg.Answer[0]).To16() </s> remove github.com/AdguardTeam/dnsproxy v0.40.6 h1:cTyzjiDrTk4vOXixLsWZ4Xjpqy6pqjTY++Tndq3bEf4=
github.com/AdguardTeam/dnsproxy v0.40.6/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 h1:DZlzFEzDV/eKJz8b+dYctAYPrQscdsvbtBc/eFU+e9U=
github.com/AdguardTeam/dnsproxy v0.41.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove github.com/AdguardTeam/dnsproxy v0.40.6
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 | proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, subnet) | continue
}
proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, subnet)
}
// TLS settings
err := s.prepareTLS(&proxyConfig) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 1730 bogus cidr
Merge in DNS/adguard-home from 1730-bogus-cidr to master
Closes #1730.
Squashed commit of the following:
commit 0be54259ca4edb8752e9f7e5ea5104a2b51ed440
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:50:01 2022 +0300
all: imp log of changes
commit 59fb7a8c469216823ff54621ec40a4d084836132
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:46:34 2022 +0300
all: log changes
commit 9206b13dd715fdf1180d1d572d1b80024b9e6592
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:41:26 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/0b72bcc5a1f4da47fe0dfc8154e71b94dcbc4896 | internal/dnsforward/config.go |
msg := &dns.Msg{}
require.NoError(t, msg.Unpack(entry.Answer))
require.Len(t, msg.Answer, 1)
ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()
assert.Equal(t, answer, ip)
}
func testEntries() (entries []*logEntry) {
rsrc := rand.NewSource(time.Now().UnixNano())
| </s> remove if len(s.conf.BogusNXDomain) > 0 {
for _, s := range s.conf.BogusNXDomain {
ip := net.ParseIP(s)
if ip == nil {
log.Error("Invalid bogus IP: %s", s)
} else {
proxyConfig.BogusNXDomain = append(proxyConfig.BogusNXDomain, ip)
}
</s> add for i, s := range s.conf.BogusNXDomain {
subnet, err := netutil.ParseSubnet(s)
if err != nil {
log.Error("subnet at index %d: %s", i, err)
continue </s> remove github.com/AdguardTeam/dnsproxy v0.40.6 h1:cTyzjiDrTk4vOXixLsWZ4Xjpqy6pqjTY++Tndq3bEf4=
github.com/AdguardTeam/dnsproxy v0.40.6/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 h1:DZlzFEzDV/eKJz8b+dYctAYPrQscdsvbtBc/eFU+e9U=
github.com/AdguardTeam/dnsproxy v0.41.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove github.com/AdguardTeam/dnsproxy v0.40.6
</s> add github.com/AdguardTeam/dnsproxy v0.41.0 | ip := proxyutil.IPFromRR(msg.Answer[0]).To16() | msg := &dns.Msg{}
require.NoError(t, msg.Unpack(entry.Answer))
require.Len(t, msg.Answer, 1)
ip := proxyutil.IPFromRR(msg.Answer[0]).To16()
assert.Equal(t, answer, ip)
}
func testEntries() (entries []*logEntry) {
rsrc := rand.NewSource(time.Now().UnixNano()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: 1730 bogus cidr
Merge in DNS/adguard-home from 1730-bogus-cidr to master
Closes #1730.
Squashed commit of the following:
commit 0be54259ca4edb8752e9f7e5ea5104a2b51ed440
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:50:01 2022 +0300
all: imp log of changes
commit 59fb7a8c469216823ff54621ec40a4d084836132
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:46:34 2022 +0300
all: log changes
commit 9206b13dd715fdf1180d1d572d1b80024b9e6592
Author: Eugene Burkov <[email protected]>
Date: Tue Jan 25 18:41:26 2022 +0300
all: upd dnsproxy | https://github.com/AdguardTeam/AdGuardHome/commit/0b72bcc5a1f4da47fe0dfc8154e71b94dcbc4896 | internal/querylog/qlog_test.go |
time.Sleep(backoff)
}
switch len(addrs) {
case 0:
// Don't return errors in case the users want to try and enable
// the DHCP server later.
t := time.Duration(n) * backoff
log.Error("dhcpv%d: no ip for iface after %d attempts and %s", ipv, n, t)
| </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove return fmt.Errorf("querylog: %w", err)
</s> add if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil </s> remove func (q *QLogFile) SeekTS(timestamp int64) (int64, int, error) {
</s> add func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) { </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) | n--
| time.Sleep(backoff)
}
n--
switch len(addrs) {
case 0:
// Don't return errors in case the users want to try and enable
// the DHCP server later.
t := time.Duration(n) * backoff
log.Error("dhcpv%d: no ip for iface after %d attempts and %s", ipv, n, t) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/aghnet/interfaces.go |
file: f,
}, nil
}
// SeekTS performs binary search in the query log file looking for a record
// with the specified timestamp. Once the record is found, it sets
// "position" so that the next ReadNext call returned that record.
//
// The algorithm is rather simple:
// 1. It starts with the position in the middle of a file
| </s> remove // SeekTS performs binary search of a query log record with the specified
</s> add // seekTS performs binary search of a query log record with the specified </s> remove func (r *QLogReader) SeekTS(timestamp int64) (err error) {
</s> add func (r *QLogReader) seekTS(timestamp int64) (err error) { </s> remove return fmt.Errorf("querylog: %w", err)
</s> add if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil </s> remove func (q *QLogFile) SeekTS(timestamp int64) (int64, int, error) {
</s> add func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) { </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} | // seekTS performs binary search in the query log file looking for a record | file: f,
}, nil
}
// seekTS performs binary search in the query log file looking for a record
// with the specified timestamp. Once the record is found, it sets
// "position" so that the next ReadNext call returned that record.
//
// The algorithm is rather simple:
// 1. It starts with the position in the middle of a file | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogfile.go |
// * It returns the position of the the line with the timestamp we were looking for
// so that when we call "ReadNext" this line was returned.
// * Depth of the search (how many times we compared timestamps).
// * If we could not find it, it returns one of the errors described above.
func (q *QLogFile) SeekTS(timestamp int64) (int64, int, error) {
q.lock.Lock()
defer q.lock.Unlock()
// Empty the buffer
q.buffer = nil
| </s> remove // SeekTS performs binary search of a query log record with the specified
</s> add // seekTS performs binary search of a query log record with the specified </s> remove // SeekTS performs binary search in the query log file looking for a record
</s> add // seekTS performs binary search in the query log file looking for a record </s> remove func (r *QLogReader) SeekTS(timestamp int64) (err error) {
</s> add func (r *QLogReader) seekTS(timestamp int64) (err error) { </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} | func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) { | // * It returns the position of the the line with the timestamp we were looking for
// so that when we call "ReadNext" this line was returned.
// * Depth of the search (how many times we compared timestamps).
// * If we could not find it, it returns one of the errors described above.
func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) {
q.lock.Lock()
defer q.lock.Unlock()
// Empty the buffer
q.buffer = nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogfile.go |
ts := readQLogTimestamp(line)
assert.NotEqualValues(t, 0, ts)
// Try seeking to that line now.
pos, _, err := q.SeekTS(ts)
require.NoError(t, err)
assert.NotEqualValues(t, 0, pos)
testLine, err := q.ReadNext()
require.NoError(t, err)
| </s> remove _, depth, err = q.SeekTS(tc.ts)
</s> add _, depth, err = q.seekTS(tc.ts) </s> remove err = r.SeekTS(ts.UnixNano())
</s> add err = r.seekTS(ts.UnixNano()) </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) </s> remove func (q *QLogFile) SeekTS(timestamp int64) (int64, int, error) {
</s> add func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) { </s> remove func (r *QLogReader) SeekTS(timestamp int64) (err error) {
</s> add func (r *QLogReader) seekTS(timestamp int64) (err error) { | pos, _, err := q.seekTS(ts) | ts := readQLogTimestamp(line)
assert.NotEqualValues(t, 0, ts)
// Try seeking to that line now.
pos, _, err := q.seekTS(ts)
require.NoError(t, err)
assert.NotEqualValues(t, 0, pos)
testLine, err := q.ReadNext()
require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogfile_test.go |
t.Run(tc.name, func(t *testing.T) {
assert.NotEqualValues(t, 0, tc.ts)
var depth int
_, depth, err = q.SeekTS(tc.ts)
assert.NotEmpty(t, l.num)
require.Error(t, err)
if tc.leq {
assert.LessOrEqual(t, depth, int(math.Log2(float64(l.num))+3))
| </s> remove err = r.SeekTS(ts.UnixNano())
</s> add err = r.seekTS(ts.UnixNano()) </s> remove _, depth, err := q.SeekTS(timestamp.Add(time.Second * time.Duration(tc.delta)).UnixNano())
</s> add _, depth, err := q.seekTS(timestamp.Add(time.Second * time.Duration(tc.delta)).UnixNano()) </s> remove pos, _, err := q.SeekTS(ts)
</s> add pos, _, err := q.seekTS(ts) </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} | _, depth, err = q.seekTS(tc.ts) | t.Run(tc.name, func(t *testing.T) {
assert.NotEqualValues(t, 0, tc.ts)
var depth int
_, depth, err = q.seekTS(tc.ts)
assert.NotEmpty(t, l.num)
require.Error(t, err)
if tc.leq {
assert.LessOrEqual(t, depth, int(math.Log2(float64(l.num))+3)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogfile_test.go |
)
q := NewTestQLogFileData(t, data)
_, depth, err := q.SeekTS(timestamp.Add(time.Second * time.Duration(tc.delta)).UnixNano())
require.Truef(t, errors.Is(err, tc.wantErr), "%v", err)
assert.Equal(t, tc.wantDepth, depth)
})
}
}
| </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove err = r.SeekTS(ts.UnixNano())
</s> add err = r.seekTS(ts.UnixNano()) </s> remove _, depth, err = q.SeekTS(tc.ts)
</s> add _, depth, err = q.seekTS(tc.ts) </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) | _, depth, err := q.seekTS(timestamp.Add(time.Second * time.Duration(tc.delta)).UnixNano()) | )
q := NewTestQLogFileData(t, data)
_, depth, err := q.seekTS(timestamp.Add(time.Second * time.Duration(tc.delta)).UnixNano())
require.Truef(t, errors.Is(err, tc.wantErr), "%v", err)
assert.Equal(t, tc.wantDepth, depth)
})
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogfile_test.go |
currentFile: (len(qFiles) - 1),
}, nil
}
// SeekTS performs binary search of a query log record with the specified
// timestamp. If the record is found, it sets QLogReader's position to point to
// that line, so that the next ReadNext call returned this line.
func (r *QLogReader) SeekTS(timestamp int64) (err error) {
for i := len(r.qFiles) - 1; i >= 0; i-- {
q := r.qFiles[i]
| </s> remove func (r *QLogReader) SeekTS(timestamp int64) (err error) {
</s> add func (r *QLogReader) seekTS(timestamp int64) (err error) { </s> remove // SeekTS performs binary search in the query log file looking for a record
</s> add // seekTS performs binary search in the query log file looking for a record </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove func (q *QLogFile) SeekTS(timestamp int64) (int64, int, error) {
</s> add func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) { </s> remove return fmt.Errorf("querylog: %w", err)
</s> add if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil | // seekTS performs binary search of a query log record with the specified | currentFile: (len(qFiles) - 1),
}, nil
}
// seekTS performs binary search of a query log record with the specified
// timestamp. If the record is found, it sets QLogReader's position to point to
// that line, so that the next ReadNext call returned this line.
func (r *QLogReader) SeekTS(timestamp int64) (err error) {
for i := len(r.qFiles) - 1; i >= 0; i-- {
q := r.qFiles[i] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogreader.go |
// SeekTS performs binary search of a query log record with the specified
// timestamp. If the record is found, it sets QLogReader's position to point to
// that line, so that the next ReadNext call returned this line.
func (r *QLogReader) SeekTS(timestamp int64) (err error) {
for i := len(r.qFiles) - 1; i >= 0; i-- {
q := r.qFiles[i]
_, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
| </s> remove // SeekTS performs binary search of a query log record with the specified
</s> add // seekTS performs binary search of a query log record with the specified </s> remove // SeekTS performs binary search in the query log file looking for a record
</s> add // seekTS performs binary search in the query log file looking for a record </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove func (q *QLogFile) SeekTS(timestamp int64) (int64, int, error) {
</s> add func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) { | func (r *QLogReader) seekTS(timestamp int64) (err error) { |
// SeekTS performs binary search of a query log record with the specified
// timestamp. If the record is found, it sets QLogReader's position to point to
// that line, so that the next ReadNext call returned this line.
func (r *QLogReader) seekTS(timestamp int64) (err error) {
for i := len(r.qFiles) - 1; i >= 0; i-- {
q := r.qFiles[i]
_, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogreader.go |
// that line, so that the next ReadNext call returned this line.
func (r *QLogReader) SeekTS(timestamp int64) (err error) {
for i := len(r.qFiles) - 1; i >= 0; i-- {
q := r.qFiles[i]
_, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
}
}
return fmt.Errorf("querylog: %w", err)
}
| </s> remove func (r *QLogReader) SeekTS(timestamp int64) (err error) {
</s> add func (r *QLogReader) seekTS(timestamp int64) (err error) { </s> remove // SeekTS performs binary search of a query log record with the specified
</s> add // seekTS performs binary search of a query log record with the specified </s> remove return fmt.Errorf("querylog: %w", err)
</s> add if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) | _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} | // that line, so that the next ReadNext call returned this line.
func (r *QLogReader) SeekTS(timestamp int64) (err error) {
for i := len(r.qFiles) - 1; i >= 0; i-- {
q := r.qFiles[i]
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
_, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
}
}
return fmt.Errorf("querylog: %w", err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogreader.go |
return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
}
}
if err != nil {
return fmt.Errorf("seekts: %w", err)
}
| </s> remove return fmt.Errorf("querylog: %w", err)
</s> add if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) </s> remove err = r.SeekTS(ts.UnixNano())
</s> add err = r.seekTS(ts.UnixNano()) | // The search is finished, and the searched element has been found.
// Update currentFile only, position is already set properly in
// QLogFile.
r.currentFile = i
return nil | return fmt.Errorf("seekts: file at index %d: %w", i, err)
}
}
// The search is finished, and the searched element has been found.
// Update currentFile only, position is already set properly in
// QLogFile.
r.currentFile = i
return nil
}
if err != nil {
return fmt.Errorf("seekts: %w", err)
}
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogreader.go |
break
}
}
return fmt.Errorf("querylog: %w", err)
}
// SeekStart changes the current position to the end of the newest file
// Please note that we're reading query log in the reverse order
// and that's why log start is actually the end of file
| </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove // SeekTS performs binary search in the query log file looking for a record
</s> add // seekTS performs binary search in the query log file looking for a record </s> remove // SeekTS performs binary search of a query log record with the specified
</s> add // seekTS performs binary search of a query log record with the specified </s> remove func (r *QLogReader) SeekTS(timestamp int64) (err error) {
</s> add func (r *QLogReader) seekTS(timestamp int64) (err error) { | if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil | break
}
}
if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil
}
// SeekStart changes the current position to the end of the newest file
// Please note that we're reading query log in the reverse order
// and that's why log start is actually the end of file | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogreader.go |
want: nil,
}, {
name: "non-existent_long_ago",
time: "2000-02-19T01:23:16.920973+03:00",
want: ErrTSTooEarly,
}, {
name: "non-existent_far_ahead",
time: "2100-02-19T01:23:16.920973+03:00",
want: nil,
}, {
| </s> remove // SeekTS performs binary search of a query log record with the specified
</s> add // seekTS performs binary search of a query log record with the specified </s> remove // SeekTS performs binary search in the query log file looking for a record
</s> add // seekTS performs binary search in the query log file looking for a record </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove _, depth, err = q.SeekTS(tc.ts)
</s> add _, depth, err = q.seekTS(tc.ts) | want: ErrTSNotFound, | want: nil,
}, {
name: "non-existent_long_ago",
time: "2000-02-19T01:23:16.920973+03:00",
want: ErrTSNotFound,
}, {
name: "non-existent_far_ahead",
time: "2100-02-19T01:23:16.920973+03:00",
want: nil,
}, { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogreader_test.go |
t.Run(tc.name, func(t *testing.T) {
ts, err := time.Parse(time.RFC3339Nano, tc.time)
require.NoError(t, err)
err = r.SeekTS(ts.UnixNano())
assert.ErrorIs(t, err, tc.want)
})
}
}
| </s> remove _, depth, err = q.SeekTS(tc.ts)
</s> add _, depth, err = q.seekTS(tc.ts) </s> remove _, depth, err := q.SeekTS(timestamp.Add(time.Second * time.Duration(tc.delta)).UnixNano())
</s> add _, depth, err := q.seekTS(timestamp.Add(time.Second * time.Duration(tc.delta)).UnixNano()) </s> remove pos, _, err := q.SeekTS(ts)
</s> add pos, _, err := q.seekTS(ts) </s> remove err = r.SeekTS(params.olderThan.UnixNano())
</s> add err = r.seekTS(params.olderThan.UnixNano()) </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} | err = r.seekTS(ts.UnixNano()) | t.Run(tc.name, func(t *testing.T) {
ts, err := time.Parse(time.RFC3339Nano, tc.time)
require.NoError(t, err)
err = r.seekTS(ts.UnixNano())
assert.ErrorIs(t, err, tc.want)
})
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/qlogreader_test.go |
if params.olderThan.IsZero() {
err = r.SeekStart()
} else {
err = r.SeekTS(params.olderThan.UnixNano())
if err == nil {
// Read to the next record, because we only need the one
// that goes after it.
_, err = r.ReadNext()
}
| </s> remove _, _, err = q.SeekTS(timestamp)
if err == nil {
// Search is finished, and the searched element have
// been found. Update currentFile only, position is
// already set properly in QLogFile.
r.currentFile = i
return nil
} else if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of
// this one.
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably
// between the end of the previous one and the start of
// this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
break
</s> add _, _, err = q.seekTS(timestamp)
if err != nil {
if errors.Is(err, ErrTSTooEarly) {
// Look at the next file, since we've reached the end of this
// one. If there is no next file, it's not found.
err = ErrTSNotFound
continue
} else if errors.Is(err, ErrTSTooLate) {
// Just seek to the start then. timestamp is probably between
// the end of the previous one and the start of this one.
return r.SeekStart()
} else if errors.Is(err, ErrTSNotFound) {
return err
} else {
return fmt.Errorf("seekts: file at index %d: %w", i, err)
} </s> remove func (r *QLogReader) SeekTS(timestamp int64) (err error) {
</s> add func (r *QLogReader) seekTS(timestamp int64) (err error) { </s> remove return fmt.Errorf("querylog: %w", err)
</s> add if err != nil {
return fmt.Errorf("seekts: %w", err)
}
return nil </s> remove func (q *QLogFile) SeekTS(timestamp int64) (int64, int, error) {
</s> add func (q *QLogFile) seekTS(timestamp int64) (int64, int, error) { | err = r.seekTS(params.olderThan.UnixNano()) |
if params.olderThan.IsZero() {
err = r.SeekStart()
} else {
err = r.seekTS(params.olderThan.UnixNano())
if err == nil {
// Read to the next record, because we only need the one
// that goes after it.
_, err = r.ReadNext()
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request: querylog: fix logic
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <[email protected]>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic | https://github.com/AdguardTeam/AdGuardHome/commit/0bd436f4b0f1196c49d788804310b8ef79970ca5 | internal/querylog/search.go |
"lint": "eslint -c ./scripts/lint/prod.js --ext .tsx --ext .ts ./",
"go:build": "cd .. && make REBUILD_CLIENT=0 build",
"go:run": "sudo ../AdguardHome"
},
"husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
"license": "ISC",
"dependencies": {
"@sentry/react": "^5.27.0",
"antd": "^4.7.2",
"classnames": "^2.2.6",
| </s> remove options: {
esModules: true,
}
</s> add </s> remove options: {
esModules: true,
}
</s> add </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | "lint": "eslint -c ./scripts/lint/prod.js --ext .tsx --ext .ts ./",
"go:build": "cd .. && make REBUILD_CLIENT=0 build",
"go:run": "sudo ../AdguardHome"
},
"license": "ISC",
"dependencies": {
"@sentry/react": "^5.27.0",
"antd": "^4.7.2",
"classnames": "^2.2.6", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/package.json |
|
"license": "ISC",
"dependencies": {
"@sentry/react": "^5.27.0",
"antd": "^4.7.2",
"classnames": "^2.2.6",
"dayjs": "^1.9.3",
| </s> remove "husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
</s> add </s> remove options: {
esModules: true,
}
</s> add </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | "@adguard/translate": "^0.2.0",
"@ant-design/icons": "^4.4.0", | "license": "ISC",
"dependencies": {
"@adguard/translate": "^0.2.0",
"@ant-design/icons": "^4.4.0",
"@sentry/react": "^5.27.0",
"antd": "^4.7.2",
"classnames": "^2.2.6",
"dayjs": "^1.9.3", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/package.json |
"mobx-react-lite": "^3.0.1",
"qs": "^6.9.4",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react-router-dom": "^5.2.0"
},
"devDependencies": {
"@types/classnames": "^2.2.10",
"@types/qs": "^6.9.5",
"@types/react": "^16.9.53",
| </s> remove options: {
esModules: true,
}
</s> add </s> remove options: {
esModules: true,
}
</s> add </s> remove "husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
</s> add </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | "react-router-dom": "^5.2.0",
"recharts": "^2.0.3" | "mobx-react-lite": "^3.0.1",
"qs": "^6.9.4",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react-router-dom": "^5.2.0",
"recharts": "^2.0.3"
},
"devDependencies": {
"@types/classnames": "^2.2.10",
"@types/qs": "^6.9.5",
"@types/react": "^16.9.53", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/package.json |
"eslint-plugin-react-hooks": "^4.2.0",
"file-loader": "^6.1.1",
"html-webpack-plugin": "^4.5.0",
"http-proxy-middleware": "^1.0.6",
"husky": "^4.3.0",
"less": "^3.12.2",
"less-loader": "^5.0.0",
"mini-css-extract-plugin": "^1.1.1",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"postcss": "^8.1.2",
| </s> remove "husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
</s> add </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | "eslint-plugin-react-hooks": "^4.2.0",
"file-loader": "^6.1.1",
"html-webpack-plugin": "^4.5.0",
"http-proxy-middleware": "^1.0.6",
"less": "^3.12.2",
"less-loader": "^5.0.0",
"mini-css-extract-plugin": "^1.1.1",
"optimize-css-assets-webpack-plugin": "^5.0.4",
"postcss": "^8.1.2", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/package.json |
|
// eslint-disable-next-line import/no-extraneous-dependencies
import * as morph from 'ts-morph';
import { ENT_DIR } from '../../consts';
import { TYPES, toCamel, schemaParamParser } from './utils';
const { Project, QuoteKind } = morph;
const EntDir = path.resolve(ENT_DIR);
| </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add | import { TYPES, toCamel, schemaParamParser, uncapitalize } from './utils'; | // eslint-disable-next-line import/no-extraneous-dependencies
import * as morph from 'ts-morph';
import { ENT_DIR } from '../../consts';
import { TYPES, toCamel, schemaParamParser, uncapitalize } from './utils';
const { Project, QuoteKind } = morph;
const EntDir = path.resolve(ENT_DIR); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
'// All changes will be overwrited on commit.',
'',
]);
const { properties: sProps, required } = this.schemas[sName];
const importEntities: { type: string, isClass: boolean }[] = [];
const entityInterface = entityFile.addInterface({
name: `I${sName}`,
isExported: true,
| </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> remove lastUpdated: string;
</s> add last_updated: string; </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; | const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} | '// All changes will be overwrited on commit.',
'',
]);
const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
}
const importEntities: { type: string, isClass: boolean }[] = [];
const entityInterface = entityFile.addInterface({
name: `I${sName}`,
isExported: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
const sortedSProps = Object.keys(sProps || {}).sort();
// add server response interface to entityFile
sortedSProps.forEach((sPropName) => {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(sProps[sPropName], this.openapi);
| </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove target: `http://${target.host}:${target.port}`, // target host
</s> add target: devHost || `http://${target.host}:${target.port}`, // target host | const additionalPropsOnly = additionalProperties && sortedSProps.length === 0;
|
const sortedSProps = Object.keys(sProps || {}).sort();
const additionalPropsOnly = additionalProperties && sortedSProps.length === 0;
// add server response interface to entityFile
sortedSProps.forEach((sPropName) => {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(sProps[sPropName], this.openapi); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
});
}
}
});
// add constructor;
const ctor = entityClass.addConstructor({
parameters: [{
name: 'props',
type: `I${sName}`,
| </s> remove type: `Partial<I${sName}>`,
</s> add type: additionalPropsOnly ? `I${sName}` : `Partial<I${sName}>`, </s> remove const { properties: sProps, required } = this.schemas[sName];
</s> add const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove update(props: Partial<IWhoisInfo>): WhoisInfo {
</s> add update(props: IWhoisInfo): WhoisInfo { | if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} | });
}
}
});
if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
}
// add constructor;
const ctor = entityClass.addConstructor({
parameters: [{
name: 'props',
type: `I${sName}`, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
});
ctor.setBodyText((w) => {
sortedSProps.forEach((sPropName) => {
const [
pType, isArray, isClass, , isAdditional
] = schemaParamParser(sProps[sPropName], this.openapi);
const req = (required && required.includes(sPropName))
| </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add | if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`} = Object.entries(props).reduce<Record<string, ${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = new ${pType}(value!);`);
} else {
w.writeLine(' prev[key] = value!;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
} | });
ctor.setBodyText((w) => {
if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`} = Object.entries(props).reduce<Record<string, ${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = new ${pType}(value!);`);
} else {
w.writeLine(' prev[key] = value!;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
}
sortedSProps.forEach((sPropName) => {
const [
pType, isArray, isClass, , isAdditional
] = schemaParamParser(sProps[sPropName], this.openapi);
const req = (required && required.includes(sPropName)) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
returnType: `I${sName}`,
});
serialize.setBodyText((w) => {
w.writeLine(`const data: I${sName} = {`);
const unReqFields: string[] = [];
sortedSProps.forEach((sPropName) => {
const req = (required && required.includes(sPropName))
|| sProps[sPropName].required;
const [, isArray, isClass, , isAdditional] = schemaParamParser(sProps[sPropName], this.openapi);
| </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`return Object.entries(this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`}).reduce<Record<string, ${isClass ? 'I' : ''}${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = value.serialize();`);
} else {
w.writeLine(' prev[key] = value;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
} | returnType: `I${sName}`,
});
serialize.setBodyText((w) => {
if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`return Object.entries(this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`}).reduce<Record<string, ${isClass ? 'I' : ''}${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = value.serialize();`);
} else {
w.writeLine(' prev[key] = value;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
}
w.writeLine(`const data: I${sName} = {`);
const unReqFields: string[] = [];
sortedSProps.forEach((sPropName) => {
const req = (required && required.includes(sPropName))
|| sProps[sPropName].required;
const [, isArray, isClass, , isAdditional] = schemaParamParser(sProps[sPropName], this.openapi); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
name: 'validate',
returnType: `string[]`,
})
validate.setBodyText((w) => {
w.writeLine('const validate = {');
Object.keys(sProps || {}).forEach((sPropName) => {
const [pType, isArray, isClass, , isAdditional] = schemaParamParser(sProps[sPropName], this.openapi);
| </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add | if (additionalPropsOnly) {
w.writeLine('return []')
return;
} | name: 'validate',
returnType: `string[]`,
})
validate.setBodyText((w) => {
if (additionalPropsOnly) {
w.writeLine('return []')
return;
}
w.writeLine('const validate = {');
Object.keys(sProps || {}).forEach((sPropName) => {
const [pType, isArray, isClass, , isAdditional] = schemaParamParser(sProps[sPropName], this.openapi);
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
returnType: `${sName}`,
});
update.addParameter({
name: 'props',
type: `Partial<I${sName}>`,
});
update.setBodyText((w) => { w.writeLine(`return new ${sName}({ ...this.serialize(), ...props });`); });
this.entities.push(entityFile);
};
| </s> remove update(props: Partial<IClientsFindEntry>): ClientsFindEntry {
</s> add update(props: IClientsFindEntry): ClientsFindEntry { </s> remove update(props: Partial<IUpstreamsConfigResponse>): UpstreamsConfigResponse {
</s> add update(props: IUpstreamsConfigResponse): UpstreamsConfigResponse { </s> remove update(props: Partial<IWhoisInfo>): WhoisInfo {
</s> add update(props: IWhoisInfo): WhoisInfo { </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | type: additionalPropsOnly ? `I${sName}` : `Partial<I${sName}>`, | returnType: `${sName}`,
});
update.addParameter({
name: 'props',
type: additionalPropsOnly ? `I${sName}` : `Partial<I${sName}>`,
});
update.setBodyText((w) => { w.writeLine(`return new ${sName}({ ...this.serialize(), ...props });`); });
this.entities.push(entityFile);
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/generateEntities.ts |
};
const capitalize = (s: string) => {
return s[0].toUpperCase() + s.slice(1);
};
const TYPES = {
integer: 'number',
float: 'number',
number: 'number',
string: 'string',
boolean: 'boolean',
| </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | const uncapitalize = (s: string) => {
return s[0].toLowerCase() + s.slice(1);
}; | };
const capitalize = (s: string) => {
return s[0].toUpperCase() + s.slice(1);
};
const uncapitalize = (s: string) => {
return s[0].toLowerCase() + s.slice(1);
};
const TYPES = {
integer: 'number',
float: 'number',
number: 'number',
string: 'string',
boolean: 'boolean', | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/utils.ts |
}
type = `${temp[temp.length - 1]}`;
const cl = openApi ? openApi.components.schemas[temp[temp.length - 1]] : {};
if (cl.type === 'string' && cl.enum) {
isImport = true;
}
| </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, </s> remove const { properties: sProps, required } = this.schemas[sName];
</s> add const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove lastUpdated: typeof this._lastUpdated === 'string' && !this._lastUpdated ? true : this._lastUpdated,
</s> add last_updated: typeof this._last_updated === 'string' && !this._last_updated ? true : this._last_updated, | const cl = openApi ? openApi.components.schemas[type] : {};
if (cl.$ref) {
const link = schemaParamParser(cl, openApi);
link.shift();
return [type, ...link] as any;
} | }
type = `${temp[temp.length - 1]}`;
const cl = openApi ? openApi.components.schemas[type] : {};
if (cl.$ref) {
const link = schemaParamParser(cl, openApi);
link.shift();
return [type, ...link] as any;
}
if (cl.type === 'string' && cl.enum) {
isImport = true;
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/utils.ts |
return [type, isArray, isClass, isImport, isAdditional];
};
export { TYPES, toCamel, capitalize, schemaParamParser };
| </s> remove import { TYPES, toCamel, schemaParamParser } from './utils';
</s> add import { TYPES, toCamel, schemaParamParser, uncapitalize } from './utils'; </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} | export { TYPES, toCamel, capitalize, uncapitalize, schemaParamParser }; |
return [type, isArray, isClass, isImport, isAdditional];
};
export { TYPES, toCamel, capitalize, uncapitalize, schemaParamParser }; | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/generator/src/utils.ts |
const { getDevServerConfig } = require('./helpers');
const baseConfig = require('./webpack.config.base');
const target = getDevServerConfig();
const options = {
target: devHost || `http://${target.host}:${target.port}`, // target host
changeOrigin: true, // needed for virtual hosted sites
};
| </s> remove target: `http://${target.host}:${target.port}`, // target host
</s> add target: devHost || `http://${target.host}:${target.port}`, // target host </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove const { properties: sProps, required } = this.schemas[sName];
</s> add const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} </s> remove import { TYPES, toCamel, schemaParamParser } from './utils';
</s> add import { TYPES, toCamel, schemaParamParser, uncapitalize } from './utils'; | const devHost = process.env.DEV_HOST |
const { getDevServerConfig } = require('./helpers');
const baseConfig = require('./webpack.config.base');
const devHost = process.env.DEV_HOST
const target = getDevServerConfig();
const options = {
target: devHost || `http://${target.host}:${target.port}`, // target host
changeOrigin: true, // needed for virtual hosted sites
}; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/webpack/webpack.config.dev.js |
const target = getDevServerConfig();
const options = {
target: `http://${target.host}:${target.port}`, // target host
changeOrigin: true, // needed for virtual hosted sites
};
const apiProxy = proxy.createProxyMiddleware(options);
module.exports = merge(baseConfig, {
| </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove const { properties: sProps, required } = this.schemas[sName];
</s> add const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} | target: devHost || `http://${target.host}:${target.port}`, // target host |
const target = getDevServerConfig();
const options = {
target: devHost || `http://${target.host}:${target.port}`, // target host
changeOrigin: true, // needed for virtual hosted sites
};
const apiProxy = proxy.createProxyMiddleware(options);
module.exports = merge(baseConfig, { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/webpack/webpack.config.dev.js |
) && !(resource.indexOf('.module.')+1);
},
use: [{
loader: MiniCssExtractPlugin.loader,
options: {
esModules: true,
}
}, 'css-loader', 'postcss-loader', {
loader: 'less-loader',
options: {
javascriptEnabled: true,
},
| </s> remove options: {
esModules: true,
}
</s> add </s> remove "husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
</s> add </s> remove interface AdminInterfaceProps {
</s> add interface RadioProps { </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | ) && !(resource.indexOf('.module.')+1);
},
use: [{
loader: MiniCssExtractPlugin.loader,
}, 'css-loader', 'postcss-loader', {
loader: 'less-loader',
options: {
javascriptEnabled: true,
}, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/webpack/webpack.config.prod.js |
|
test: /\.module\.p?css$/,
use: [
{
loader: MiniCssExtractPlugin.loader,
options: {
esModules: true,
}
},
{
loader: 'css-loader',
options: {
modules: true,
| </s> remove options: {
esModules: true,
}
</s> add </s> remove interface AdminInterfaceProps {
</s> add interface RadioProps { </s> remove const { properties: sProps, required } = this.schemas[sName];
</s> add const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} | test: /\.module\.p?css$/,
use: [
{
loader: MiniCssExtractPlugin.loader,
},
{
loader: 'css-loader',
options: {
modules: true, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/scripts/webpack/webpack.config.prod.js |
|
import React, { FC } from 'react';
import { Layout } from 'antd';
import { Formik, FormikHelpers } from 'formik';
import { observer } from 'mobx-react-lite';
import { IInitialConfigurationBeta } from 'Entities/InitialConfigurationBeta';
import Icons from 'Common/ui/Icons';
import {
DEFAULT_DNS_ADDRESS,
| </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | import cn from 'classnames'; | import React, { FC } from 'react';
import { Layout } from 'antd';
import { Formik, FormikHelpers } from 'formik';
import { observer } from 'mobx-react-lite';
import cn from 'classnames';
import { IInitialConfigurationBeta } from 'Entities/InitialConfigurationBeta';
import Icons from 'Common/ui/Icons';
import {
DEFAULT_DNS_ADDRESS, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/Install.tsx |
import { Formik, FormikHelpers } from 'formik';
import { observer } from 'mobx-react-lite';
import { IInitialConfigurationBeta } from 'Entities/InitialConfigurationBeta';
import Icons from 'Lib/theme/Icons';
import {
DEFAULT_DNS_ADDRESS,
DEFAULT_DNS_PORT,
DEFAULT_IP_ADDRESS,
DEFAULT_IP_PORT,
| </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; | import Icons from 'Common/ui/Icons'; | import { Formik, FormikHelpers } from 'formik';
import { observer } from 'mobx-react-lite';
import { IInitialConfigurationBeta } from 'Entities/InitialConfigurationBeta';
import Icons from 'Common/ui/Icons';
import {
DEFAULT_DNS_ADDRESS,
DEFAULT_DNS_PORT,
DEFAULT_IP_ADDRESS,
DEFAULT_IP_PORT, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/Install.tsx |
});
const Install: FC = () => {
return (
<Layout className={theme.install.layout}>
<Content className={theme.install.container}>
<InstallForm />
</Content>
<Icons/>
</Layout>
);
| </s> remove const dhcp = (e: string) => (
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a>
);
</s> add </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> remove this.intl = this.intl.updateTranslator(lang);
</s> add this.intl = translate.createReactTranslator<any>(i18n(this.currentLang), React);
};
toggleSidebar = () => {
this.sidebarOpen = !this.sidebarOpen; </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | <Layout className={cn(theme.content.content, theme.content.content_auth)}>
<Content className={cn(theme.content.container, theme.content.container_auth)}> | });
const Install: FC = () => {
return (
<Layout className={cn(theme.content.content, theme.content.content_auth)}>
<Content className={cn(theme.content.container, theme.content.container_auth)}>
<Layout className={cn(theme.content.content, theme.content.content_auth)}>
<Content className={cn(theme.content.container, theme.content.container_auth)}>
<InstallForm />
</Content>
<Icons/>
</Layout>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/Install.tsx |
import { Tabs, Grid } from 'antd';
import cn from 'classnames';
import { FormikHelpers } from 'formik';
import Store from 'Store/installStore';
import theme from 'Lib/theme';
import { FormValues } from '../../Install';
import StepButtons from '../StepButtons';
| </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install'; | import { Tabs, Grid } from 'antd';
import cn from 'classnames';
import { FormikHelpers } from 'formik';
import { DHCP_LINK } from 'Consts/common';
import { danger, externalLink, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
import Store from 'Store/installStore';
import theme from 'Lib/theme';
import { FormValues } from '../../Install';
import StepButtons from '../StepButtons'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
import { FormikHelpers } from 'formik';
import Store from 'Store/installStore';
import theme from 'Lib/theme';
import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
import { FormValues } from '../../Install';
import StepButtons from '../StepButtons';
const { useBreakpoint } = Grid;
| </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | import { FormikHelpers } from 'formik';
import Store from 'Store/installStore';
import theme from 'Lib/theme';
import { FormValues } from '../../Install';
import StepButtons from '../StepButtons';
const { useBreakpoint } = Grid; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
|
const { ui: { intl }, install: { addresses } } = useContext(Store);
const screens = useBreakpoint();
const tabsPosition = screens.md ? 'left' : 'top';
const dhcp = (e: string) => (
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a>
);
const allIps = addresses?.interfaces.reduce<string[]>((all, data) => {
const { ipAddresses } = data;
if (ipAddresses) {
all.push(...ipAddresses);
}
| </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | const { ui: { intl }, install: { addresses } } = useContext(Store);
const screens = useBreakpoint();
const tabsPosition = screens.md ? 'left' : 'top';
const allIps = addresses?.interfaces.reduce<string[]>((all, data) => {
const { ipAddresses } = data;
if (ipAddresses) {
all.push(...ipAddresses);
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
|
))}
</div>
</div>
<div className={cn(theme.install.text, theme.install.text_base)}>
{intl.getMessage('install_configure_dhcp', { dhcp })}
</div>
<StepButtons
setFieldValue={setFieldValue}
currentStep={4}
values={values}
| </s> remove const dhcp = (e: string) => (
<a
href="https://github.com/AdguardTeam/AdGuardHome/wiki/DHCP"
target="_blank"
rel="noopener noreferrer"
className={theme.link.link}
>
{e}
</a>
);
</s> add </s> remove options: {
esModules: true,
}
</s> add </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | {intl.getMessage('install_configure_dhcp', { dhcp: externalLink(DHCP_LINK) })} | ))}
</div>
</div>
<div className={cn(theme.install.text, theme.install.text_base)}>
{intl.getMessage('install_configure_dhcp', { dhcp: externalLink(DHCP_LINK) })}
</div>
<StepButtons
setFieldValue={setFieldValue}
currentStep={4}
values={values} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/Install/components/ConfigureDevices/ConfigureDevices.tsx |
import s from './Radio.module.pcss';
const { Group } = Radio;
interface AdminInterfaceProps {
options: {
label: string;
desc?: string;
value: string | number;
}[];
| </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> remove const RadioComponent: FC<AdminInterfaceProps> = observer(({
</s> add const RadioComponent: FC<RadioProps> = observer(({ </s> remove lastUpdated: string;
</s> add last_updated: string; | interface RadioProps { | import s from './Radio.module.pcss';
const { Group } = Radio;
interface RadioProps {
options: {
label: string;
desc?: string;
value: string | number;
}[]; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/controls/Radio/Radio.tsx |
onSelect: (value: string | number) => void;
value: string | number;
}
const RadioComponent: FC<AdminInterfaceProps> = observer(({
options, onSelect, value,
}) => {
if (options.length === 0) {
return null;
}
| </s> remove interface AdminInterfaceProps {
</s> add interface RadioProps { </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; </s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add | const RadioComponent: FC<RadioProps> = observer(({ | onSelect: (value: string | number) => void;
value: string | number;
}
const RadioComponent: FC<RadioProps> = observer(({
options, onSelect, value,
}) => {
if (options.length === 0) {
return null;
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/controls/Radio/Radio.tsx |
import React, { FC } from 'react';
import cn from 'classnames';
import { IconType } from 'Lib/theme/Icons';
import s from './Icon.module.pcss';
interface IconProps {
icon: IconType;
| </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> remove import React from 'react';
</s> add | import { IconType } from 'Common/ui/Icons'; | import React, { FC } from 'react';
import cn from 'classnames';
import { IconType } from 'Common/ui/Icons';
import s from './Icon.module.pcss';
interface IconProps {
icon: IconType; | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/ui/Icon/Icon.tsx |
);
};
export default Icon;
export { IconType } from 'Lib/theme/Icons';
| </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); | export { IconType } from 'Common/ui/Icons'; | );
};
export default Icon;
export { IconType } from 'Common/ui/Icons'; | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/components/common/ui/Icon/Icon.tsx |
@text-color: #000;
@link-hover-color: #4d995f;
@link-active-color: #4d995f;
@font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
@font-size-base: 14px;
| </s> remove --black: #000000;
</s> add --black: #131313; </s> remove font-size: 14px;
</s> add font-size: 16px; </s> remove ]
</s> add ],
"useDefineForClassFields": true | @text-selection-bg: #e7efff;
@layout-body-background: #f3f3f3;
@layout-header-background: #131313;
@menu-dark-submenu-bg: #131313; | @text-color: #000;
@link-hover-color: #4d995f;
@link-active-color: #4d995f;
@text-selection-bg: #e7efff;
@layout-body-background: #f3f3f3;
@layout-header-background: #131313;
@menu-dark-submenu-bg: #131313;
@font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
@font-size-base: 14px; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/ant/ant-overrides.less |
import './Radio.pcss';
const insertStyles = true;
export default insertStyles;
| </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> remove const cl = openApi ? openApi.components.schemas[temp[temp.length - 1]] : {};
</s> add const cl = openApi ? openApi.components.schemas[type] : {};
if (cl.$ref) {
const link = schemaParamParser(cl, openApi);
link.shift();
return [type, ...link] as any;
} | import './Sidebar.pcss';
import './Tabs.pcss';
import './Modal.pcss'; | import './Radio.pcss';
import './Sidebar.pcss';
import './Tabs.pcss';
import './Modal.pcss';
const insertStyles = true;
export default insertStyles; | [
"add",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/ant/index.ts |
import qs from 'qs';
import Client, { IClient } from 'Entities/Client';
import ClientDelete, { IClientDelete } from 'Entities/ClientDelete';
import ClientUpdate, { IClientUpdate } from 'Entities/ClientUpdate';
import Clients, { IClients } from 'Entities/Clients';
| </s> remove import { danger, p } from 'Common/formating';
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
</s> add </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; | import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; | import qs from 'qs';
import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest';
import Client, { IClient } from 'Entities/Client';
import ClientDelete, { IClientDelete } from 'Entities/ClientDelete';
import ClientUpdate, { IClientUpdate } from 'Entities/ClientUpdate';
import Clients, { IClients } from 'Entities/Clients'; | [
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/clients.ts |
import DhcpConfig, { IDhcpConfig } from 'Entities/DhcpConfig';
import DhcpSearchResult, { IDhcpSearchResult } from 'Entities/DhcpSearchResult';
import DhcpStaticLease, { IDhcpStaticLease } from 'Entities/DhcpStaticLease';
import DhcpStatus, { IDhcpStatus } from 'Entities/DhcpStatus';
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export default class DhcpApi {
static async checkActiveDhcp(): Promise<IDhcpSearchResult | Error> {
return await fetch(`/control/dhcp/find_active_dhcp`, {
| </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> remove username?: string;
</s> add | import NetInterfaces, { INetInterfaces } from 'Entities/NetInterfaces'; | import DhcpConfig, { IDhcpConfig } from 'Entities/DhcpConfig';
import DhcpSearchResult, { IDhcpSearchResult } from 'Entities/DhcpSearchResult';
import DhcpStaticLease, { IDhcpStaticLease } from 'Entities/DhcpStaticLease';
import DhcpStatus, { IDhcpStatus } from 'Entities/DhcpStatus';
import NetInterfaces, { INetInterfaces } from 'Entities/NetInterfaces';
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export default class DhcpApi {
static async checkActiveDhcp(): Promise<IDhcpSearchResult | Error> {
return await fetch(`/control/dhcp/find_active_dhcp`, { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/dhcp.ts |
}
static async dhcpRemoveStaticLease(dhcpstaticlease: IDhcpStaticLease): Promise<number | string[] | Error> {
const haveError: string[] = [];
const dhcpstaticleaseValid = new DhcpStaticLease(dhcpstaticlease);
haveError.push(...dhcpstaticleaseValid.validate());
if (haveError.length > 0) {
| </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | static async dhcpInterfaces(): Promise<INetInterfaces | Error> {
return await fetch(`/control/dhcp/interfaces`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.json();
} else {
return new Error(String(res.status));
}
})
}
| }
static async dhcpInterfaces(): Promise<INetInterfaces | Error> {
return await fetch(`/control/dhcp/interfaces`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.json();
} else {
return new Error(String(res.status));
}
})
}
static async dhcpRemoveStaticLease(dhcpstaticlease: IDhcpStaticLease): Promise<number | string[] | Error> {
const haveError: string[] = [];
const dhcpstaticleaseValid = new DhcpStaticLease(dhcpstaticlease);
haveError.push(...dhcpstaticleaseValid.validate());
if (haveError.length > 0) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/dhcp.ts |
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export default class MobileconfigApi {
static async mobileConfigDoH(host?: string): Promise<number | Error> {
const queryParams = {
host: host,
}
return await fetch(`/control/apple/doh.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET',
| </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> remove username?: string;
</s> add | static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { |
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export default class MobileconfigApi {
static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> {
const queryParams = {
host: host,
}
return await fetch(`/control/apple/doh.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
const queryParams = {
host: host,
}
return await fetch(`/control/apple/doh.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.status;
| </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | client_id: client_id, | const queryParams = {
host: host,
client_id: client_id,
}
return await fetch(`/control/apple/doh.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.status; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
}
})
}
static async mobileConfigDoT(host?: string): Promise<number | Error> {
const queryParams = {
host: host,
}
return await fetch(`/control/apple/dot.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET',
| </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { | static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { | }
})
}
static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> {
const queryParams = {
host: host,
}
return await fetch(`/control/apple/dot.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> {
const queryParams = {
host: host,
}
return await fetch(`/control/apple/dot.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.status;
| </s> remove static async mobileConfigDoT(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> { </s> remove static async mobileConfigDoH(host?: string): Promise<number | Error> {
</s> add static async mobileConfigDoH(host?: string, client_id?: string): Promise<number | Error> { | client_id: client_id, |
static async mobileConfigDoT(host?: string, client_id?: string): Promise<number | Error> {
const queryParams = {
host: host,
client_id: client_id,
}
return await fetch(`/control/apple/dot.mobileconfig?${qs.stringify(queryParams, { arrayFormat: 'comma' })}`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.status; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/apis/mobileconfig.ts |
import NetInterface, { INetInterface } from './NetInterface';
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export interface IAddressesInfo {
dns_port: number;
| </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> remove dns_address: string;
</s> add dns_addresses: string[]; | import NetInterfaces, { INetInterfaces } from './NetInterfaces'; | import NetInterfaces, { INetInterfaces } from './NetInterfaces';
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export interface IAddressesInfo {
dns_port: number; | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export interface IAddressesInfo {
dns_port: number;
interfaces: { [key: string]: INetInterface };
web_port: number;
}
export default class AddressesInfo {
readonly _dns_port: number;
| </s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; </s> remove key?: string;
</s> add [key: string]: string; | interfaces: INetInterfaces; | // This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export interface IAddressesInfo {
dns_port: number;
interfaces: INetInterfaces;
web_port: number;
}
export default class AddressesInfo {
readonly _dns_port: number; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
static dnsPortValidate(dnsPort: number): boolean {
return typeof dnsPort === 'number';
}
readonly _interfaces: { [key: string]: NetInterface };
/** */
get interfaces(): { [key: string]: NetInterface } {
return this._interfaces;
}
| </s> remove /** */
get interfaces(): { [key: string]: NetInterface } {
</s> add get interfaces(): NetInterfaces { </s> remove return this._rulesCount;
</s> add return this._rules_count; </s> remove readonly _lastUpdated: string;
</s> add readonly _last_updated: string; </s> remove readonly _querylog_enabled: boolean;
get querylogEnabled(): boolean {
return this._querylog_enabled;
}
static querylogEnabledValidate(querylogEnabled: boolean): boolean {
return typeof querylogEnabled === 'boolean';
}
</s> add | readonly _interfaces: NetInterfaces; | static dnsPortValidate(dnsPort: number): boolean {
return typeof dnsPort === 'number';
}
readonly _interfaces: NetInterfaces;
/** */
get interfaces(): { [key: string]: NetInterface } {
return this._interfaces;
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
}
readonly _interfaces: { [key: string]: NetInterface };
/** */
get interfaces(): { [key: string]: NetInterface } {
return this._interfaces;
}
readonly _web_port: number;
| </s> remove readonly _interfaces: { [key: string]: NetInterface };
</s> add readonly _interfaces: NetInterfaces; </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; | get interfaces(): NetInterfaces { | }
readonly _interfaces: { [key: string]: NetInterface };
get interfaces(): NetInterfaces {
get interfaces(): NetInterfaces {
return this._interfaces;
}
readonly _web_port: number;
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
}
constructor(props: IAddressesInfo) {
this._dns_port = props.dns_port;
this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
this._web_port = props.web_port;
}
serialize(): IAddressesInfo {
const data: IAddressesInfo = {
| </s> remove interfaces: Object.keys(this._interfaces).reduce<Record<string, any>>((prev, key) => ({ ...prev, [key]: this._interfaces[key].serialize() }), {}),
</s> add interfaces: this._interfaces.serialize(), </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | this._interfaces = new NetInterfaces(props.interfaces); | }
constructor(props: IAddressesInfo) {
this._dns_port = props.dns_port;
this._interfaces = new NetInterfaces(props.interfaces);
this._interfaces = new NetInterfaces(props.interfaces);
this._interfaces = new NetInterfaces(props.interfaces);
this._web_port = props.web_port;
}
serialize(): IAddressesInfo {
const data: IAddressesInfo = { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
serialize(): IAddressesInfo {
const data: IAddressesInfo = {
dns_port: this._dns_port,
interfaces: Object.keys(this._interfaces).reduce<Record<string, any>>((prev, key) => ({ ...prev, [key]: this._interfaces[key].serialize() }), {}),
web_port: this._web_port,
};
return data;
}
| </s> remove this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
</s> add this._interfaces = new NetInterfaces(props.interfaces); </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> remove dns_address: this._dns_address,
</s> add dns_addresses: this._dns_addresses, </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | interfaces: this._interfaces.serialize(), |
serialize(): IAddressesInfo {
const data: IAddressesInfo = {
dns_port: this._dns_port,
interfaces: this._interfaces.serialize(),
web_port: this._web_port,
};
return data;
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
const validate = {
dns_port: typeof this._dns_port === 'number',
web_port: typeof this._web_port === 'number',
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
| </s> remove rulesCount: typeof this._rulesCount === 'number',
</s> add rules_count: typeof this._rules_count === 'number', </s> remove username: !this._username ? true : typeof this._username === 'string' && !this._username ? true : this._username,
</s> add name: !this._name ? true : typeof this._name === 'string' && !this._name ? true : this._name, </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | interfaces: this._interfaces.validate().length === 0, | const validate = {
dns_port: typeof this._dns_port === 'number',
web_port: typeof this._web_port === 'number',
interfaces: this._interfaces.validate().length === 0,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/AddressesInfo.ts |
safesearch_enabled?: boolean;
upstreams?: string[];
use_global_blocked_services?: boolean;
use_global_settings?: boolean;
whois_info?: IWhoisInfo[];
}
export default class ClientFindSubEntry {
readonly _blocked_services: string[] | undefined;
| </s> remove querylog_enabled: boolean;
</s> add </s> remove rulesCount: number;
</s> add rules_count: number; </s> remove dns_address: string;
</s> add dns_addresses: string[]; | whois_info?: IWhoisInfo; | safesearch_enabled?: boolean;
upstreams?: string[];
use_global_blocked_services?: boolean;
use_global_settings?: boolean;
whois_info?: IWhoisInfo;
}
export default class ClientFindSubEntry {
readonly _blocked_services: string[] | undefined;
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
get useGlobalSettings(): boolean | undefined {
return this._use_global_settings;
}
readonly _whois_info: WhoisInfo[] | undefined;
get whoisInfo(): WhoisInfo[] | undefined {
return this._whois_info;
}
| </s> remove get whoisInfo(): WhoisInfo[] | undefined {
</s> add get whoisInfo(): WhoisInfo | undefined { </s> remove readonly _username: string | undefined;
</s> add readonly _password: string | undefined; </s> remove get password(): string | undefined {
return this._password;
</s> add get name(): string | undefined {
return this._name; </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; | readonly _whois_info: WhoisInfo | undefined; | get useGlobalSettings(): boolean | undefined {
return this._use_global_settings;
}
readonly _whois_info: WhoisInfo | undefined;
get whoisInfo(): WhoisInfo[] | undefined {
return this._whois_info;
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
}
readonly _whois_info: WhoisInfo[] | undefined;
get whoisInfo(): WhoisInfo[] | undefined {
return this._whois_info;
}
constructor(props: IClientFindSubEntry) {
if (props.blocked_services) {
| </s> remove readonly _whois_info: WhoisInfo[] | undefined;
</s> add readonly _whois_info: WhoisInfo | undefined; </s> remove get username(): string | undefined {
return this._username;
</s> add get password(): string | undefined {
return this._password; </s> remove readonly _username: string | undefined;
</s> add readonly _password: string | undefined; </s> remove readonly _key: string | undefined;
get key(): string | undefined {
return this._key;
}
</s> add readonly data: Record<string, string>; | get whoisInfo(): WhoisInfo | undefined { | }
readonly _whois_info: WhoisInfo[] | undefined;
get whoisInfo(): WhoisInfo | undefined {
return this._whois_info;
}
constructor(props: IClientFindSubEntry) {
if (props.blocked_services) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
if (typeof props.use_global_settings === 'boolean') {
this._use_global_settings = props.use_global_settings;
}
if (props.whois_info) {
this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
}
}
serialize(): IClientFindSubEntry {
const data: IClientFindSubEntry = {
| </s> remove data.whois_info = this._whois_info.map((p) => p.serialize());
</s> add data.whois_info = this._whois_info.serialize(); </s> remove if (typeof props.username === 'string') {
this._username = props.username.trim();
}
</s> add | this._whois_info = new WhoisInfo(props.whois_info); | if (typeof props.use_global_settings === 'boolean') {
this._use_global_settings = props.use_global_settings;
}
if (props.whois_info) {
this._whois_info = new WhoisInfo(props.whois_info);
}
}
serialize(): IClientFindSubEntry {
const data: IClientFindSubEntry = { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
if (typeof this._use_global_settings !== 'undefined') {
data.use_global_settings = this._use_global_settings;
}
if (typeof this._whois_info !== 'undefined') {
data.whois_info = this._whois_info.map((p) => p.serialize());
}
return data;
}
validate(): string[] {
| </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | data.whois_info = this._whois_info.serialize(); | if (typeof this._use_global_settings !== 'undefined') {
data.use_global_settings = this._use_global_settings;
}
if (typeof this._whois_info !== 'undefined') {
data.whois_info = this._whois_info.serialize();
}
return data;
}
validate(): string[] { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
safesearch_enabled: !this._safesearch_enabled ? true : typeof this._safesearch_enabled === 'boolean',
use_global_blocked_services: !this._use_global_blocked_services ? true : typeof this._use_global_blocked_services === 'boolean',
blocked_services: !this._blocked_services ? true : this._blocked_services.reduce((result, p) => result && typeof p === 'string', true),
upstreams: !this._upstreams ? true : this._upstreams.reduce((result, p) => result && typeof p === 'string', true),
whois_info: !this._whois_info ? true : this._whois_info.reduce((result, p) => result && p.validate().length === 0, true),
disallowed: !this._disallowed ? true : typeof this._disallowed === 'boolean',
disallowed_rule: !this._disallowed_rule ? true : typeof this._disallowed_rule === 'string' && !this._disallowed_rule ? true : this._disallowed_rule,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
| </s> remove dns_address: typeof this._dns_address === 'string' && !this._dns_address ? true : this._dns_address,
</s> add dns_addresses: this._dns_addresses.reduce((result, p) => result && typeof p === 'string', true), </s> remove querylog_enabled: typeof this._querylog_enabled === 'boolean',
</s> add | whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0, | safesearch_enabled: !this._safesearch_enabled ? true : typeof this._safesearch_enabled === 'boolean',
use_global_blocked_services: !this._use_global_blocked_services ? true : typeof this._use_global_blocked_services === 'boolean',
blocked_services: !this._blocked_services ? true : this._blocked_services.reduce((result, p) => result && typeof p === 'string', true),
upstreams: !this._upstreams ? true : this._upstreams.reduce((result, p) => result && typeof p === 'string', true),
whois_info: !this._whois_info ? true : this._whois_info.validate().length === 0,
disallowed: !this._disallowed ? true : typeof this._disallowed === 'boolean',
disallowed_rule: !this._disallowed_rule ? true : typeof this._disallowed_rule === 'string' && !this._disallowed_rule ? true : this._disallowed_rule,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientFindSubEntry.ts |
// This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export interface IClientsFindEntry {
}
export default class ClientsFindEntry {
readonly data: Record<string, ClientFindSubEntry>;
| </s> remove username?: string;
</s> add </s> remove key?: string;
</s> add [key: string]: string; </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; | [key: string]: IClientFindSubEntry; | // This file was autogenerated. Please do not change.
// All changes will be overwrited on commit.
export interface IClientsFindEntry {
[key: string]: IClientFindSubEntry;
}
export default class ClientsFindEntry {
readonly data: Record<string, ClientFindSubEntry>; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
}
export default class ClientsFindEntry {
constructor(props: IClientsFindEntry) {
this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {})
| </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | readonly data: Record<string, ClientFindSubEntry>;
| }
export default class ClientsFindEntry {
readonly data: Record<string, ClientFindSubEntry>;
constructor(props: IClientsFindEntry) {
this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
constructor(props: IClientsFindEntry) {
}
serialize(): IClientsFindEntry {
return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
| </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove if (typeof props.domain_or_ip === 'number') {
this._domain_or_ip = props.domain_or_ip;
}
</s> add this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) | this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) |
constructor(props: IClientsFindEntry) {
this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {})
}
serialize(): IClientsFindEntry {
return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize(); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
constructor(props: IClientsFindEntry) {
}
serialize(): IClientsFindEntry {
const data: IClientsFindEntry = {
};
return data;
}
validate(): string[] {
const validate = {
};
| </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove if (typeof this._username !== 'undefined') {
data.username = this._username;
}
</s> add </s> remove const data: IWhoisInfo = {
};
if (typeof this._key !== 'undefined') {
data.key = this._key;
}
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) | return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | constructor(props: IClientsFindEntry) {
}
serialize(): IClientsFindEntry {
return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {})
return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {})
return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {})
}
validate(): string[] {
const validate = {
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
return data;
}
validate(): string[] {
const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
}
update(props: Partial<IClientsFindEntry>): ClientsFindEntry {
return new ClientsFindEntry({ ...this.serialize(), ...props });
}
| </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
key: !this._key ? true : typeof this._key === 'string' && !this._key ? true : this._key,
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove update(props: Partial<IClientsFindEntry>): ClientsFindEntry {
</s> add update(props: IClientsFindEntry): ClientsFindEntry { </s> remove update(props: Partial<IUpstreamsConfigResponse>): UpstreamsConfigResponse {
</s> add update(props: IUpstreamsConfigResponse): UpstreamsConfigResponse { </s> remove update(props: Partial<IWhoisInfo>): WhoisInfo {
</s> add update(props: IWhoisInfo): WhoisInfo { | return [] | return data;
}
validate(): string[] {
return []
return []
return []
return []
return []
return []
return []
return []
return []
}
update(props: Partial<IClientsFindEntry>): ClientsFindEntry {
return new ClientsFindEntry({ ...this.serialize(), ...props });
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:18 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c
Author: Vlad <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
Date: Wed Jan 27 15:45:12 2021 +0300
Pull request #949: + client: add setup guide page
Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard
Squashed commit of the following:
commit c240d52e9e5d90429f2018fde808f4d04ccec138
Merge: 256f1056 137b88e4
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:57 2021 +0300
Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard
commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/entities/ClientsFindEntry.ts |
Subsets and Splits