Applications: {apps && apps.appcount}
+Workspaces: {workspaces && workspaces.workspacecount}
- {filteredapps && filteredapps.length > 0 && filteredapps.map(function (app, i) {
- return
diff --git a/site/pages/addapp/[[...app]].js b/site/pages/new/[[...workspace]].js
similarity index 72%
rename from site/pages/addapp/[[...app]].js
rename to site/pages/new/[[...workspace]].js
index 9a807f3..3a562fb 100644
--- a/site/pages/addapp/[[...app]].js
+++ b/site/pages/new/[[...workspace]].js
@@ -4,17 +4,17 @@ import { saveAs } from 'file-saver';
import CreatableSelect from 'react-select/creatable';
import Select from 'react-select';
import { useRouter } from 'next/router'
-import allapps from '../../../public/list.json'
+import allworkspaces from '../../../public/list.json'
export async function getStaticPaths() {
- let paths = allapps.apps.map(app => ({
+ let paths = allworkspaces.workspaces.map(workspace => ({
params: {
- app: [btoa(app.name)]
+ workspace: [btoa(workspace.name)]
}
}))
paths.push({
- params: { app: null }
+ params: { workspace: null }
})
return {
paths,
@@ -24,47 +24,14 @@ export async function getStaticPaths() {
// `getStaticPaths` requires using `getStaticProps`
export async function getStaticProps({ params }) {
- const app = params.app
+ const workspace = params.workspace
return {
// Passed to the page component as props
- props: { app: app ?? null },
+ props: { workspace: workspace ?? null },
}
}
-export default function AddApp({ app }) {
-
- function friendlyUrl(url) {
- // make the url lowercase
- var encodedUrl = url.toString().toLowerCase();
- // replace & with and
- encodedUrl = encodedUrl.split(/\&+/).join("-and-")
- // remove invalid characters
- encodedUrl = encodedUrl.split(/[^a-z0-9]/).join("-");
- // remove duplicates
- encodedUrl = encodedUrl.split(/-+/).join("-");
- // trim leading & trailing characters
- encodedUrl = encodedUrl.trim('-');
- return encodedUrl;
- }
-
- const downloadZip = () => {
- var JSZip = require("jszip");
- const zip = new JSZip()
- const folder = zip.folder(application.friendly_name)
- folder.file('app.json', JSON.stringify(application, null, 2))
- if (icon) {
- folder.file(application.image_src, icon.file)
- }
- else if (inlineImage) {
- const promise = fetch(inlineImage).then(response => response.blob())
- folder.file(application.image_src, promise)
- }
- zip.generateAsync({ type: "blob" })
- .then(function (content) {
- // Force down of the Zip file
- saveAs(content, friendlyUrl(application.friendly_name) + '.zip');
- });
- }
+export default function New({ workspace }) {
const name = useRef(null);
const friendly_name = useRef(null);
@@ -92,58 +59,58 @@ export default function AddApp({ app }) {
image_type: 'Container',
}
- const [application, setApplication] = useState(defaultState)
+ const [workspace, setWorkspace] = useState(defaultState)
const router = useRouter()
- // const { app } = router.query
+ // const { workspace } = router.query
useEffect(() => {
- console.log(app)
- if(app === null) {
+ console.log(workspace)
+ if(workspace === null) {
description.current.value = ''
name.current.value = ''
friendly_name.current.value = ''
setCategories(null)
setArchitecture(null)
setIcon(null)
- setApplication(defaultState)
+ setWorkspace(defaultState)
}
- else if (app && app[0]) {
- const appDetails = allapps.apps.find(el => el.name === atob(app[0]))
- delete appDetails['sha']
- description.current.value = appDetails.description
- name.current.value = appDetails.name
- friendly_name.current.value = appDetails.friendly_name
- if (appDetails.categories) {
+ else if (workspace && workspace[0]) {
+ const workspaceDetails = allworkspaces.workspaces.find(el => el.name === atob(workspace[0]))
+ delete workspaceDetails['sha']
+ description.current.value = workspaceDetails.description
+ name.current.value = workspaceDetails.name
+ friendly_name.current.value = workspaceDetails.friendly_name
+ if (workspaceDetails.categories) {
let catMap = []
- appDetails.categories.map((e) => catMap.push({
+ workspaceDetails.categories.map((e) => catMap.push({
label: e,
value: e,
}))
setCategories(catMap)
}
- if (appDetails.architecture) {
+ if (workspaceDetails.architecture) {
let archMap = []
- appDetails.architecture.map((e) => archMap.push({
+ workspaceDetails.architecture.map((e) => archMap.push({
label: e,
value: e,
}))
setArchitecture(archMap)
}
- setInlineImage('../../icons/' + appDetails.image_src)
+ setInlineImage('../../icons/' + workspaceDetails.image_src)
- setApplication({
- ...application,
- ...appDetails
+ setWorkspace({
+ ...workspace,
+ ...workspaceDetails
})
}
- }, [app])
+ }, [workspace])
- const displayApplication = () => {
+ const displayWorkspace = () => {
return {
- ...application,
- // categories: JSON.stringify(application.categories)
+ ...workspace,
+ // categories: JSON.stringify(workspace.categories)
}
}
@@ -163,23 +130,23 @@ export default function AddApp({ app }) {
}
useEffect(() => {
- if (application && application.friendly_name) {
- const updateapp = {
- ...application
+ if (workspace && workspace.friendly_name) {
+ const updateWorkspace = {
+ ...workspace
}
- updateapp.image_src = friendlyUrl(updateapp.friendly_name) + '.' + ext
- setApplication(updateapp)
+ updateWorkspace.image_src = friendlyUrl(updateWorkspace.friendly_name) + '.' + ext
+ setWorkspace(updateWorkspace)
}
}, [ext])
const updateCategories = (items) => {
- const updateapp = {
- ...application
+ const updateWorkspace = {
+ ...workspace
}
- updateapp.categories = items.map(cat => cat.value)
- setApplication(updateapp)
+ updateWorkspace.categories = items.map(cat => cat.value)
+ setWorkspace(updateWorkspace)
let catMap = []
- updateapp.categories.map((e) => catMap.push({
+ updateWorkspace.categories.map((e) => catMap.push({
label: e,
value: e,
}))
@@ -187,27 +154,59 @@ export default function AddApp({ app }) {
}
const updateArchitecture = (items) => {
- const updateapp = {
- ...application
+ const updateWorkspace = {
+ ...workspace
}
- updateapp.architecture = items.map(arch => arch.value)
- setApplication(updateapp)
+ updateWorkspace.architecture = items.map(arch => arch.value)
+ setWorkspace(updateWorkspace)
let archMap = []
- updateapp.architecture.map((e) => archMap.push({
+ updateWorkspace.architecture.map((e) => archMap.push({
label: e,
value: e,
}))
setArchitecture(archMap)
}
+ function friendlyUrl(url) {
+ // make the url lowercase
+ var encodedUrl = url.toString().toLowerCase();
+ // replace & with and
+ encodedUrl = encodedUrl.split(/\&+/).join("-and-")
+ // remove invalid characters
+ encodedUrl = encodedUrl.split(/[^a-z0-9]/).join("-");
+ // remove duplicates
+ encodedUrl = encodedUrl.split(/-+/).join("-");
+ // trim leading & trailing characters
+ encodedUrl = encodedUrl.trim('-');
+ return encodedUrl;
+ }
+
+ const downloadZip = () => {
+ var JSZip = require("jszip");
+ const zip = new JSZip()
+ const folder = zip.folder(workspace.friendly_name)
+ folder.file('workspace.json', JSON.stringify(workspace, null, 2))
+ if (icon) {
+ folder.file(workspace.image_src, icon.file)
+ }
+ else if (inlineImage) {
+ const promise = fetch(inlineImage).then(response => response.blob())
+ folder.file(workspace.image_src, promise)
+ }
+ zip.generateAsync({ type: "blob" })
+ .then(function (content) {
+ // Force down of the Zip file
+ saveAs(content, friendlyUrl(workspace.friendly_name) + '.zip');
+ });
+ }
const handleChange = (event) => {
- const updateapp = {
- ...application
+ const updateWorkspace = {
+ ...workspace
}
- updateapp[event.target.name] = event.target.value
+ updateWorkspace[event.target.name] = event.target.value
if (event.target.name === 'icon') {
- delete updateapp.icon
+ delete updateWorkspace.icon
setIcon({
value: event.target.value,
file: event.target.files[0]
@@ -217,11 +216,11 @@ export default function AddApp({ app }) {
// return
}
- if (updateapp.friendly_name) {
- updateapp.image_src = friendlyUrl(updateapp.friendly_name) + '.' + ext
+ if (updateWorkspace.friendly_name) {
+ updateWorkspace.image_src = friendlyUrl(updateWorkspace.friendly_name) + '.' + ext
}
- setApplication(updateapp)
+ setWorkspace(updateWorkspace)
}
const options = [
@@ -240,15 +239,15 @@ export default function AddApp({ app }) {
return (
No applications found {searchText !== '' && ('matching "' + searchText + '"')}
+ {filteredworkspaces && filteredworkspaces.length === 0 && ( +No workspaces found {searchText !== '' && ('matching "' + searchText + '"')}
)}
- Kasm Apps
-
+ Kasm Workspaces
+
@@ -307,7 +306,7 @@ export default function AddApp({ app }) {
}
-function App({ app, icon, inlineImage }) {
+function Workspace({ workspace, icon, inlineImage }) {
const [showDescription, setShowDescription] = useState(false);
@@ -316,7 +315,7 @@ function App({ app, icon, inlineImage }) {
if (icon) {
const blob = new Blob([icon.file])
srcBlob = URL.createObjectURL(blob);
- app.image_src = srcBlob
+ workspace.image_src = srcBlob
}
const installButton = () => {
@@ -329,30 +328,30 @@ function App({ app, icon, inlineImage }) {
return
}
- const appExists = false
+ const workspaceExists = false
return (
+
-
Add Application
+Add Workspace
-
This will help you generate the JSON file you need to upload to the App directory.
+This page is designed to allow admins to generate the JSON they need to upload to the "workspaces" directory. It also allows end users to see what settings are needed if they want to manually copy them into a new workspace.
@@ -272,7 +271,7 @@ export default function AddApp({ app }) { -A short description about the application
+A short description about the workspace
@@ -296,8 +295,8 @@ export default function AddApp({ app }) {
-
{JSON.stringify(displayApplication(), null, 2)}
+ {JSON.stringify(displayWorkspace(), null, 2)}
setShowDescription(true)} className={"h-[100px] p-4 relative overflow-hidden cursor-pointer"}>
- 
{
- if ( inlineImage !== null) { e.target.src = inlineImage }}} alt={app.friendly_name} />
+ 
{
+ if ( inlineImage !== null) { e.target.src = inlineImage }}} alt={workspace.friendly_name} />
@@ -360,7 +359,7 @@ function App({ app, icon, inlineImage }) {
-
-
{app.friendly_name || 'Friendly Name'}
- {process.env.name || 'Unknown'} {official()}
+ {workspace.friendly_name || 'Friendly Name'}
+ {process.env.name || 'Manual'} {official()}
- {app.architecture && app.architecture.map((arch, index) => (
+ {workspace.architecture && workspace.architecture.map((arch, index) => (
{arch}
))}
- {app.categories.map((cat, index) => (
+ {workspace.categories.map((cat, index) => (
{cat}
))}
- {appExists && appExists.enabled === true && appExists.available === false && (
+ {workspaceExists && workspaceExists.enabled === true && workspaceExists.available === false && (
Installing
)}
{app.friendly_name}
{app.description}{workspace.friendly_name}
{workspace.description}
{editButton()}
{installButton()}
diff --git a/workspaces/README.md b/workspaces/README.md
new file mode 100644
index 0000000..ebf6ecc
--- /dev/null
+++ b/workspaces/README.md
@@ -0,0 +1,7 @@
+# Workspaces directory
+
+This directory is for storing all the files needed for your workspaces store, they should be stored with the following structure:
+
+* workspaces/Workspace Name
+* workspaces/Workspace Name/workspace.json
+* workspaces/Workspace Name/workspace-name.png
\ No newline at end of file