Skip to content

Commit 16879f3

Browse files
author
OpenShift Bot
authored
Merge pull request openshift#701 from spadgett/catalog-updates
Merged by openshift-bot
2 parents ba787e8 + 0ff66a1 commit 16879f3

32 files changed

+1900
-1234
lines changed

app/index.html

+5
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ <h1>JavaScript Required</h1>
202202
<script src="scripts/services/breadcrumbs.js"></script>
203203
<script src="scripts/services/quota.js"></script>
204204
<script src="scripts/services/labels.js"></script>
205+
<script src="scripts/services/catalog.js"></script>
205206
<script src="scripts/controllers/projects.js"></script>
206207
<script src="scripts/controllers/pods.js"></script>
207208
<script src="scripts/controllers/pod.js"></script>
@@ -235,6 +236,7 @@ <h1>JavaScript Required</h1>
235236
<script src="scripts/controllers/edit/healthChecks.js"></script>
236237
<script src="scripts/controllers/edit/route.js"></script>
237238
<script src="scripts/controllers/edit/yaml.js"></script>
239+
<script src="scripts/controllers/create/browseCategory.js"></script>
238240
<script src="scripts/controllers/create/createFromImage.js"></script>
239241
<script src="scripts/controllers/create/nextSteps.js"></script>
240242
<script src="scripts/controllers/newfromtemplate.js"></script>
@@ -295,6 +297,9 @@ <h1>JavaScript Required</h1>
295297
<script src="scripts/directives/tasks.js"></script>
296298
<script src="scripts/directives/truncate.js"></script>
297299
<script src="scripts/directives/catalog.js"></script>
300+
<script src="scripts/directives/catalog/categoryContent.js"></script>
301+
<script src="scripts/directives/catalog/catalogImage.js"></script>
302+
<script src="scripts/directives/catalog/catalogTemplate.js"></script>
298303
<script src="scripts/directives/oscObjectDescriber.js"></script>
299304
<script src="scripts/directives/podMetrics.js"></script>
300305
<script src="scripts/directives/deploymentMetrics.js"></script>

app/scripts/app.js

+8
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,14 @@ angular
291291
controller: 'CreateController',
292292
reloadOnSearch: false
293293
})
294+
.when('/project/:project/create/category/:category', {
295+
templateUrl: 'views/create/category.html',
296+
controller: 'BrowseCategoryController'
297+
})
298+
.when('/project/:project/create/category/:category/:subcategory', {
299+
templateUrl: 'views/create/category.html',
300+
controller: 'BrowseCategoryController'
301+
})
294302
.when('/project/:project/create/fromtemplate', {
295303
templateUrl: 'views/newfromtemplate.html',
296304
controller: 'NewFromTemplateController'

app/scripts/constants.js

+131
Original file line numberDiff line numberDiff line change
@@ -216,5 +216,136 @@ window.OPENSHIFT_CONSTANTS = {
216216
// }
217217
// ]
218218
}
219+
],
220+
CATALOG_CATEGORIES: [
221+
{
222+
id: 'languages',
223+
label: "Languages",
224+
iconClassDefault: "fa fa-code",
225+
items: [
226+
{
227+
id: "java",
228+
label: "Java",
229+
iconClass: "font-icon icon-openjdk",
230+
subcategories: [{
231+
id: 'java-subcategories',
232+
items: [
233+
{
234+
id: "amq",
235+
label: "Red Hat JBoss A-MQ"
236+
},
237+
{
238+
id: "processserver",
239+
label: "Red Hat JBoss BPM Suite"
240+
},
241+
{
242+
id: "decisionserver",
243+
label: "Red Hat JBoss BRMS"
244+
},
245+
{
246+
id: "datagrid",
247+
label: "Red Hat JBoss Data Grid"
248+
},
249+
{
250+
id: "eap",
251+
label: "Red Hat JBoss EAP"
252+
},
253+
{
254+
id: "jboss-fuse",
255+
label: "Red Hat JBoss Fuse"
256+
},
257+
{
258+
id: "tomcat",
259+
label: "Red Hat JBoss Web Server (Tomcat)"
260+
},
261+
{
262+
id: "sso",
263+
label: "Red Hat Single Sign-On"
264+
},
265+
{
266+
id: "wildfly",
267+
label: "WildFly"
268+
}
269+
]
270+
}]
271+
},
272+
{
273+
id: "javascript",
274+
categoryAliases: ["nodejs","js"],
275+
label: "JavaScript",
276+
iconClass: "font-icon icon-js"
277+
},
278+
{
279+
id: "dotnet",
280+
label: ".NET",
281+
iconClass: "font-icon icon-dotnet"
282+
},
283+
{
284+
id: "perl",
285+
label: "Perl",
286+
iconClass: "font-icon icon-perl"
287+
},
288+
{
289+
id: "php",
290+
label: "PHP",
291+
iconClass: "font-icon icon-php"
292+
},
293+
{
294+
id: "python",
295+
label: "Python",
296+
iconClass: "font-icon icon-python"
297+
},
298+
{
299+
id: "ruby",
300+
label: "Ruby",
301+
iconClass: "font-icon icon-ruby"
302+
}
303+
]
304+
},
305+
{
306+
id: 'technologies',
307+
label: "Technologies",
308+
items: [
309+
{
310+
id: "business-process-services",
311+
categoryAliases: ["decisionserver","processserver"],
312+
label: "Business Process Services",
313+
description: "Model, automate, and orchestrate business processes across applications, services, and data."
314+
},
315+
{
316+
id: "ci-cd",
317+
categoryAliases:["jenkins"],
318+
label: "Continuous Integration & Deployment",
319+
description: "Automate the build, test, and deploymeant of your application with each new code revision."
320+
},
321+
{
322+
id: "datastore",
323+
categoryAliases: ["database","datagrid"],
324+
label: "Data Stores",
325+
description: "Store and manage collections of data."
326+
},
327+
{
328+
id: "messaging",
329+
label: "Messaging",
330+
description: "Facilitate communication between applications and distributed processes with a messaging server."
331+
},
332+
{
333+
id: "integration",
334+
label: "Integration",
335+
description: "Connect with other applications and data to enhance functionality without duplication."
336+
},
337+
{
338+
id: "single-sign-on",
339+
categoryAliases: ["sso"],
340+
label: "Single Sign-On",
341+
description: "A centralized authentication server for users to log in, log out, register, and manage user accounts for applications and RESTful web services."
342+
},
343+
{
344+
id: "",
345+
label: "Uncategorized",
346+
description: ""
347+
}
348+
]
349+
}
219350
]
220351
};

0 commit comments

Comments
 (0)