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

Jump to bottom

[WIP] - migration to reactjs #335

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

[WIP] - migration to reactjs #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
016d792
step
skiptomyliu Nov 25, 2021
c43cce0
more
skiptomyliu Nov 25, 2021
03fbf2d
services
skiptomyliu Nov 25, 2021
c2251a3
show hide
skiptomyliu Nov 25, 2021
b22555d
button state
skiptomyliu Nov 25, 2021
93e5c46
search
skiptomyliu Nov 25, 2021
ed606f3
search services
skiptomyliu Nov 26, 2021
08df64b
convering more to functions
skiptomyliu Dec 3, 2021
ea1c828
add ResourcesList convert Resources to functional component
skiptomyliu Dec 10, 2021
0a6bc30
functional components
skiptomyliu Dec 10, 2021
2baae94
WIP to react
skiptomyliu Dec 31, 2021
54e7c34
navigation header resources and history button
skiptomyliu Dec 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion confidant/authnz/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def decorated(*args, **kwargs):
if not settings.USE_AUTH:
return f(*args, **kwargs)

# User suppplied basic auth info
# User supplied basic auth info
try:
kms_auth_data = _get_kms_auth_data()
except AuthenticationError:
Expand Down
13 changes: 12 additions & 1 deletion confidant/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@
<!-- endbuild -->
</head>
<body>
<div id="mainReactDiv"></div>

<!--[if lt IE 9]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->

<!-- Add your site or application content here -->
<!--
<div id="loading-spinner" loading-spinner="data-loading"></div>
<header id="page-header" class="header">
<nav id="site-navigation">
Expand All @@ -33,13 +36,14 @@ <h1><a href="#"><img class="site-logo visible-sm visible-md visible-lg" src="ima
</div>
</nav>
</header>

<div id="page-navigation" class="container-fluid container-bottomborder has-margin-bottom" role="navigation" ng-controller="common.NavCtrl">
<ul class="nav nav-pills has-margin-bottom">
<li role="presentation" ng-class="{ 'active': viewLocation === 'resources' }"><a href="#/resources">Resources <span class="glyphicon glyphicon-lock"></span></a></li>
<li role="presentation" ng-class="{ 'active': viewLocation === 'history' }"><a href="#/history">History <span class="glyphicon glyphicon-time"></span></a></li>
</ul>
</div>
-->
<div ui-view="main" class="container-fluid container-body"></div>

<!-- build:js scripts/oldieshim.js -->
Expand Down Expand Up @@ -107,5 +111,12 @@ <h1><a href="#"><img class="site-logo visible-sm visible-md visible-lg" src="ima
<!-- endinjector -->
<script src="/modules/app.js"></script>
<!-- endbuild -->

<script src="/react_modules/common/react.development.js.1"></script>
<script src="/react_modules/common/react-dom.development.js.1"></script>
<script src="/react_modules/common/babel.min.js.1"></script>
<script type="module" src="/react_modules/common/react-router-dom.js"></script>
<script type="module" src="/react_modules/prod/index.js"></script>
<!-- <script type="module" src="/react_modules/prod/services.js"></script> -->
</body>
</html>
2 changes: 1 addition & 1 deletion confidant/public/modules/resources/controllers/ResourceCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@

}]);

})(window.angular);
})(window.angular);
11 changes: 10 additions & 1 deletion confidant/public/modules/resources/views/resources.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
<div class="row row-relative">
<div class="col-md-5 well row-relative">

<div id="reactDiv"></div>

<!--
<div class="row">
<div class="form">
<div class="form-group col-md-12">
<input type="search" class="form-control" data-ng-model="resourceRegex" placeholder="filter (credential, blind-credential, or service name)" />
</div>
</div>
</div>

<div class="row has-margin-bottom-lg">
<div class="col-md-9">
<button type="button" ng-class="{ 'active': typeFilter == 'credentials' }" ng-click="setTypeFilter('credentials')" class="btn">Credentials</button>
Expand All @@ -24,7 +29,7 @@
<div class="row has-margin-bottom-lg">
<div class="form">
<div class="simple-form col-md-12">
<label for="showDiabledInput"><input id="showDiabledInput" type="checkbox" data-ng-model="showDisabled" /> Show disabled resources</label>
<label for="showDiabledInput"><input id="showDiabledInput" type="checkbox" data-ng-model="showDisabled" /> disabled resources</label>
</div>
</div>
</div>
Expand Down Expand Up @@ -62,13 +67,17 @@
<td>{{ resource.modified_by }}</td>
<td><span class="glyphicon glyphicon-menu-right"></span></td>
</tr>


</tbody>
</table>
</div>
</div>
-->
</div>
<div class="col-md-7 row-overflow">
<div ui-view="details"><div class="row"><div class="no-details-text"><h3>No resource selected.</h3></div></div></div>
<div ui-view="docs"></div>
</div>
</div>

43 changes: 43 additions & 0 deletions confidant/public/react_modules/common/babel.min.js.1
View file
Open in desktop

Large diffs are not rendered by default.

Loading