diff --git a/Web-app/.editorconfig b/Web-app/.editorconfig new file mode 100644 index 0000000..6e87a00 --- /dev/null +++ b/Web-app/.editorconfig @@ -0,0 +1,13 @@ +# Editor configuration, see http://editorconfig.org +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +max_line_length = off +trim_trailing_whitespace = false diff --git a/Web-app/bot-browser/.gitignore b/Web-app/.gitignore similarity index 100% rename from Web-app/bot-browser/.gitignore rename to Web-app/.gitignore diff --git a/Web-app/bot-browser/README.md b/Web-app/README.md similarity index 100% rename from Web-app/bot-browser/README.md rename to Web-app/README.md diff --git a/Web-app/bot-browser/angular.json b/Web-app/angular.json similarity index 100% rename from Web-app/bot-browser/angular.json rename to Web-app/angular.json diff --git a/Web-app/e2e/protractor.conf.js b/Web-app/e2e/protractor.conf.js new file mode 100644 index 0000000..86776a3 --- /dev/null +++ b/Web-app/e2e/protractor.conf.js @@ -0,0 +1,28 @@ +// Protractor configuration file, see link for more information +// https://github.com/angular/protractor/blob/master/lib/config.ts + +const { SpecReporter } = require('jasmine-spec-reporter'); + +exports.config = { + allScriptsTimeout: 11000, + specs: [ + './src/**/*.e2e-spec.ts' + ], + capabilities: { + 'browserName': 'chrome' + }, + directConnect: true, + baseUrl: 'http://localhost:4200/', + framework: 'jasmine', + jasmineNodeOpts: { + showColors: true, + defaultTimeoutInterval: 30000, + print: function() {} + }, + onPrepare() { + require('ts-node').register({ + project: require('path').join(__dirname, './tsconfig.e2e.json') + }); + jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); + } +}; \ No newline at end of file diff --git a/Web-app/e2e/src/app.e2e-spec.ts b/Web-app/e2e/src/app.e2e-spec.ts new file mode 100644 index 0000000..2e91662 --- /dev/null +++ b/Web-app/e2e/src/app.e2e-spec.ts @@ -0,0 +1,14 @@ +import { AppPage } from './app.po'; + +describe('workspace-project App', () => { + let page: AppPage; + + beforeEach(() => { + page = new AppPage(); + }); + + it('should display welcome message', () => { + page.navigateTo(); + expect(page.getParagraphText()).toEqual('Welcome to bot-browser!'); + }); +}); diff --git a/Web-app/bot-browser/e2e/src/app.po.ts b/Web-app/e2e/src/app.po.ts similarity index 100% rename from Web-app/bot-browser/e2e/src/app.po.ts rename to Web-app/e2e/src/app.po.ts diff --git a/Web-app/bot-browser/e2e/tsconfig.e2e.json b/Web-app/e2e/tsconfig.e2e.json similarity index 100% rename from Web-app/bot-browser/e2e/tsconfig.e2e.json rename to Web-app/e2e/tsconfig.e2e.json diff --git a/Web-app/bot-browser/package-lock.json b/Web-app/package-lock.json similarity index 100% rename from Web-app/bot-browser/package-lock.json rename to Web-app/package-lock.json diff --git a/Web-app/bot-browser/package.json b/Web-app/package.json similarity index 96% rename from Web-app/bot-browser/package.json rename to Web-app/package.json index a46d649..edb89e0 100644 --- a/Web-app/bot-browser/package.json +++ b/Web-app/package.json @@ -9,7 +9,7 @@ "test": "ng test", "lint": "ng lint", "e2e": "ng e2e", - "publish": "ng build --prod --base-href \"https://madsholten.github.io/ng-plan/\" && npx ngh --dir=dist/ng-plan-lib" + "publish": "ng build --prod --base-href \"https://madsholten.github.io/BOT-Duplex-house/\" && npx ngh --dir=dist/bot-browser" }, "private": true, "dependencies": { diff --git a/Web-app/bot-browser/patch.js b/Web-app/patch.js similarity index 100% rename from Web-app/bot-browser/patch.js rename to Web-app/patch.js diff --git a/Web-app/src/app/app.component.css b/Web-app/src/app/app.component.css new file mode 100644 index 0000000..521850f --- /dev/null +++ b/Web-app/src/app/app.component.css @@ -0,0 +1,39 @@ +.button-row{ + position: absolute; + width: 245px; + left: 5px; + top: 5px; + z-index: 100; +} +.button-row > button { + margin-right: 10px; +} +.item { + padding-top: 10px; + width: 100%; +} +.selected { + color:red; +} +.drag-card{ + position: absolute; + left: 100px; + top: 100px; + background-color: rgba(220,220,220,.6); + border-radius: 5px; + font-family: roboto; + font-size: 0.7em; + padding: 0px; + z-index: 110; +} +.msg { + position: absolute; + left: 5px; + bottom: 5px; + border-radius: 5px; + background-color: #eeeeee; + font-family: consolas; + font-size: 0.8em; + padding-left: 15px; + padding-right: 15px; +} \ No newline at end of file diff --git a/Web-app/bot-browser/src/app/app.component.html b/Web-app/src/app/app.component.html similarity index 100% rename from Web-app/bot-browser/src/app/app.component.html rename to Web-app/src/app/app.component.html diff --git a/Web-app/bot-browser/src/app/app.component.spec.ts b/Web-app/src/app/app.component.spec.ts similarity index 100% rename from Web-app/bot-browser/src/app/app.component.spec.ts rename to Web-app/src/app/app.component.spec.ts diff --git a/Web-app/bot-browser/src/app/app.component.ts b/Web-app/src/app/app.component.ts similarity index 100% rename from Web-app/bot-browser/src/app/app.component.ts rename to Web-app/src/app/app.component.ts diff --git a/Web-app/bot-browser/src/app/app.module.ts b/Web-app/src/app/app.module.ts similarity index 100% rename from Web-app/bot-browser/src/app/app.module.ts rename to Web-app/src/app/app.module.ts diff --git a/Web-app/bot-browser/src/app/app.service.ts b/Web-app/src/app/app.service.ts similarity index 100% rename from Web-app/bot-browser/src/app/app.service.ts rename to Web-app/src/app/app.service.ts diff --git a/Web-app/src/assets/.gitkeep b/Web-app/src/assets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/Web-app/bot-browser/src/assets/duplex.ttl b/Web-app/src/assets/duplex.ttl similarity index 100% rename from Web-app/bot-browser/src/assets/duplex.ttl rename to Web-app/src/assets/duplex.ttl diff --git a/Web-app/src/browserslist b/Web-app/src/browserslist new file mode 100644 index 0000000..8e09ab4 --- /dev/null +++ b/Web-app/src/browserslist @@ -0,0 +1,9 @@ +# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers +# For additional information regarding the format and rule options, please see: +# https://github.com/browserslist/browserslist#queries +# For IE 9-11 support, please uncomment the last line of the file and adjust as needed +> 0.5% +last 2 versions +Firefox ESR +not dead +# IE 9-11 \ No newline at end of file diff --git a/Web-app/src/environments/environment.prod.ts b/Web-app/src/environments/environment.prod.ts new file mode 100644 index 0000000..3612073 --- /dev/null +++ b/Web-app/src/environments/environment.prod.ts @@ -0,0 +1,3 @@ +export const environment = { + production: true +}; diff --git a/Web-app/bot-browser/src/environments/environment.ts b/Web-app/src/environments/environment.ts similarity index 100% rename from Web-app/bot-browser/src/environments/environment.ts rename to Web-app/src/environments/environment.ts diff --git a/Web-app/bot-browser/src/favicon.ico b/Web-app/src/favicon.ico similarity index 100% rename from Web-app/bot-browser/src/favicon.ico rename to Web-app/src/favicon.ico diff --git a/Web-app/bot-browser/src/index.html b/Web-app/src/index.html similarity index 100% rename from Web-app/bot-browser/src/index.html rename to Web-app/src/index.html diff --git a/Web-app/bot-browser/src/karma.conf.js b/Web-app/src/karma.conf.js similarity index 100% rename from Web-app/bot-browser/src/karma.conf.js rename to Web-app/src/karma.conf.js diff --git a/Web-app/bot-browser/src/main.ts b/Web-app/src/main.ts similarity index 100% rename from Web-app/bot-browser/src/main.ts rename to Web-app/src/main.ts diff --git a/Web-app/bot-browser/src/polyfills.ts b/Web-app/src/polyfills.ts similarity index 100% rename from Web-app/bot-browser/src/polyfills.ts rename to Web-app/src/polyfills.ts diff --git a/Web-app/bot-browser/src/styles.css b/Web-app/src/styles.css similarity index 100% rename from Web-app/bot-browser/src/styles.css rename to Web-app/src/styles.css diff --git a/Web-app/bot-browser/src/test.ts b/Web-app/src/test.ts similarity index 100% rename from Web-app/bot-browser/src/test.ts rename to Web-app/src/test.ts diff --git a/Web-app/bot-browser/src/tsconfig.app.json b/Web-app/src/tsconfig.app.json similarity index 100% rename from Web-app/bot-browser/src/tsconfig.app.json rename to Web-app/src/tsconfig.app.json diff --git a/Web-app/bot-browser/src/tsconfig.spec.json b/Web-app/src/tsconfig.spec.json similarity index 100% rename from Web-app/bot-browser/src/tsconfig.spec.json rename to Web-app/src/tsconfig.spec.json diff --git a/Web-app/bot-browser/src/tslint.json b/Web-app/src/tslint.json similarity index 100% rename from Web-app/bot-browser/src/tslint.json rename to Web-app/src/tslint.json diff --git a/Web-app/bot-browser/tsconfig.json b/Web-app/tsconfig.json similarity index 100% rename from Web-app/bot-browser/tsconfig.json rename to Web-app/tsconfig.json diff --git a/Web-app/bot-browser/tslint.json b/Web-app/tslint.json similarity index 100% rename from Web-app/bot-browser/tslint.json rename to Web-app/tslint.json diff --git a/package.json b/package.json new file mode 100644 index 0000000..fa1a470 --- /dev/null +++ b/package.json @@ -0,0 +1,8 @@ +{ + "name": "bot-duplex-house", + "version": "0.0.1", + "scripts": { + "publish": "npx ngh --dir=Web-app/dist/bot-browser" + }, + "author": "Mads Holten Rasmussen" +} diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..ec2620b --- /dev/null +++ b/readme.md @@ -0,0 +1,22 @@ +## BOT Duplex Apartment + +[demo](https://madsholten.github.io/BOT-Duplex-house/) + +This repository consists of the following: + +1) A compiled version of the [Revit-BOT-exporter](https://github.com/MadsHolten/revit-bot-exporter) with the following settings: + * Units described using [CDT](https://ci.mines-stetienne.fr/lindt/v2/custom_datatypes.html#) + * Properties described with [OPM](https://w3id.org/opm) + * 2D geometry described as [WKT](https://en.wikipedia.org/wiki/Well-known_text) literals + * 3D mesh geometry described as [OBJ](https://en.wikipedia.org/wiki/Wavefront_.obj_file) literals + * Products described with the [PRODUCT](https://github.com/w3c-lbd-cg/product) ontology + +2) Model files: + * Revit version of the Common BIM file [Duplex Apartment](https://www.nibs.org/page/bsa_commonbimfiles#project1) + * Converted files from the [Revit-BOT-exporter](https://github.com/MadsHolten/revit-bot-exporter) + +3) A web application built on Angular 6 and custom developed libraries [ng-plan](https://www.npmjs.com/package/ng-plan) and [ng-mesh-viewer](https://www.npmjs.com/package/ng-mesh-viewer) for visualizing 2D and 3D geometry. Try the [demo](https://madsholten.github.io/BOT-Duplex-house/). + +4) A test tool which loads the LBD file in a triplestore and performs a set of queries on it + +The content of the repository is described in detail in an article entitled *The BOT ontology: standards within a decentralised web-based AEC industry* which is currently under review for publication in Automation in Construction. \ No newline at end of file