Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Feature/dns #101

Merged
merged 31 commits into from
Nov 25, 2022
Merged

Feature/dns #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ebf28da
init domains tab
mlsmaycon Sep 26, 2022
e816f23
dns
mlsmaycon Sep 27, 2022
b174072
Merge branch 'main' into feature/dns
mlsmaycon Sep 27, 2022
c567349
add initial dns store
mlsmaycon Sep 27, 2022
e9bd822
Add tab draft
mlsmaycon Sep 27, 2022
e09ad39
use nameservers and nameserver group ref
mlsmaycon Oct 6, 2022
b97b6d3
use nameserver store
mlsmaycon Oct 6, 2022
5a829c4
Merge branch 'main' into feature/dns
mlsmaycon Oct 7, 2022
65065fd
nameserver update
mlsmaycon Oct 7, 2022
23c9b3b
Merge branch 'main' into feature/dns
mlsmaycon Oct 19, 2022
ba30183
Initial add nameserver code
mlsmaycon Oct 21, 2022
2ba14d9
fix status
mlsmaycon Oct 21, 2022
78f881a
Merge branch 'main' into feature/dns
mlsmaycon Nov 6, 2022
0b4b603
Added predefined choices
mlsmaycon Nov 7, 2022
4e58b5f
rename DNS
mlsmaycon Nov 7, 2022
8b90eb0
add domains fields
mlsmaycon Nov 12, 2022
1884f7e
Merge branch 'main' into feature/dns
mlsmaycon Nov 14, 2022
402d7cd
Merge remote-tracking branch 'origin/main' into feature/dns
braginini Nov 21, 2022
6143707
Add missing DNS tab
braginini Nov 21, 2022
2f686b5
adjust tab order
mlsmaycon Nov 23, 2022
4db8dd0
update user only when there is change and if the users state
mlsmaycon Nov 24, 2022
e19c38a
resolve react warnings
mlsmaycon Nov 24, 2022
08b30a4
update DNS view
mlsmaycon Nov 24, 2022
67de284
export selectValidator
mlsmaycon Nov 24, 2022
be65b2c
fix fields validator
mlsmaycon Nov 24, 2022
0cf2a2f
update text and validate domain entry
mlsmaycon Nov 24, 2022
c66ad0a
add search filters and name validation
mlsmaycon Nov 24, 2022
b94b78d
add possible domain view for peer new name
mlsmaycon Nov 24, 2022
e42fa0b
refresh groups after creating ns group
mlsmaycon Nov 24, 2022
178a6b1
removed logs and call onCancel on submit
mlsmaycon Nov 24, 2022
fa487d0
remove extra style and disable protocol selection
mlsmaycon Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"lodash": "^4.17.21",
"postcss": "^8.4.12",
"prop-types": "^15.7.2",
"punycode": "^2.1.1",
"rc-overflow": "^1.2.8",
"react": "^18.2.0",
"react-dom": "^18.1.0",
Expand Down
82 changes: 43 additions & 39 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ import FooterComponent from "./components/FooterComponent";
import {useGetAccessTokenSilently} from "./utils/token";
import {User} from "./store/user/types";
import {SecureLoading} from "./components/Loading";
import DNS from "./views/DNS";



const {Header, Content} = Layout;

Expand Down Expand Up @@ -52,8 +55,8 @@ function App() {
if (!run.current) {
run.current = true
apiClient.request<User[]>('GET', `/api/users`, {getAccessTokenSilently: getAccessTokenSilently})
.then((resp) => {
setShow(true)
.then(() => {
setShow(true)
})
.catch(e => {
setShow(true)
Expand All @@ -68,43 +71,44 @@ function App() {
<Provider store={store}>
{!show && <SecureLoading padding="3em" width={50} height={50}/>}
{show &&
<Layout>
<Banner/>
<Header className="header" style={{
display: "flex",
flexDirection: "column",
justifyContent: "space-around",
alignContent: "center"
}}>
<Row justify="space-around" align="middle">
<Col span={24}>
<Container>
<Navbar/>
</Container>
</Col>
</Row>
</Header>
<Content style={{minHeight: "100vh"}}>
<Switch>
<Route
exact
path="/"
render={() => {
return (
<Redirect to="/peers"/>
)
}}
/>
<Route path='/peers' exact component={withOidcSecure(Peers)}/>
<Route path="/add-peer" component={withOidcSecure(AddPeer)}/>
<Route path="/setup-keys" component={withOidcSecure(SetupKeys)}/>
<Route path="/acls" component={withOidcSecure(AccessControl)}/>
<Route path="/routes" component={withOidcSecure(Routes)}/>
<Route path="/users" component={withOidcSecure(Users)}/>
</Switch>
</Content>
<FooterComponent/>
</Layout>
<Layout>
<Banner/>
<Header className="header" style={{
display: "flex",
flexDirection: "column",
justifyContent: "space-around",
alignContent: "center"
}}>
<Row justify="space-around" align="middle">
<Col span={24}>
<Container>
<Navbar/>
</Container>
</Col>
</Row>
</Header>
<Content style={{minHeight: "100vh"}}>
<Switch>
<Route
exact
path="/"
render={() => {
return (
<Redirect to="/peers"/>
)
}}
/>
<Route path='/peers' exact component={withOidcSecure(Peers)}/>
<Route path="/add-peer" component={withOidcSecure(AddPeer)}/>
<Route path="/setup-keys" component={withOidcSecure(SetupKeys)}/>
<Route path="/acls" component={withOidcSecure(AccessControl)}/>
<Route path="/routes" component={withOidcSecure(Routes)}/>
<Route path="/users" component={withOidcSecure(Users)}/>
<Route path="/dns" component={withOidcSecure(DNS)}/>
</Switch>
</Content>
<FooterComponent/>
</Layout>
}
</Provider>
</>
Expand Down
2 changes: 1 addition & 1 deletion src/components/AccessControlNew.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ const AccessControlNew = () => {
const selectValidator = (_: RuleObject, value: string[]) => {
let hasSpaceNamed = []
if (!value.length) {
return Promise.reject(new Error("Please enter ate least one group"))
return Promise.reject(new Error("Please enter at least one group"))
}

value.forEach(function (v: string) {
Expand Down
Loading