Skip to content

Commit

Permalink
Preparation for Alfa version (#7)
Browse files Browse the repository at this point in the history
* [ci] Fix #6 CI copy index.html to 404.html
* [ng] Restore routing
* [ng] Geometry selection and state save
* [ng] [threejs] Disable transparency order check
* [ng] [threejs] Better material rendering
* [ng] Added geometry outline and merge
* [ng] Preparing smart node editing
* [ng] Hand written rules
* [ng] Implement three helper functions
* [ng] Fix all unit tests
* [ng] Implemented controls + better geometry cleaning
* [ng] Geometry prettification classes added
* [ng] UI Config storage updates
* [ng] User config storage, service and UI are done
* [ng] Tracks ui
* [ng] Loads events
* [ng] Pretty particle trajectories and whole lot of updates
  • Loading branch information
DraTeots authored May 29, 2024
1 parent 537a036 commit 77e53bf
Show file tree
Hide file tree
Showing 41 changed files with 3,846 additions and 429 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ jobs:
echo "--- ls ./dist/firebird"
ls -latrh ./dist/firebird
# Make dynamic routing work after reload or going directly to page
# See issue #6 or https://angular.io/guide/deployment#deploy-to-github-pages
- name: Fix dynamic routing
run: |
cp ./dist/firebird/index.html ./dist/firebird/404.html
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,5 @@ dist
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
.idea/*


.vscode/
3 changes: 3 additions & 0 deletions firebird-ng/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,8 @@
}
}
}
},
"cli": {
"analytics": "aa6f00cf-04e4-4e98-9d0e-1423cb1a0d51"
}
}
16 changes: 14 additions & 2 deletions firebird-ng/package-lock.json

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

6 changes: 4 additions & 2 deletions firebird-ng/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "firebird",
"version": "0.0.1",
"version": "0.0.2",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand All @@ -24,14 +24,16 @@
"@types/picomatch": "^2.3.3",
"jsdom": "^24.0.0",
"jsrootdi": "^7.6.101",
"outmatch": "^1.0.0",
"phoenix-event-display": "^2.16.0",
"phoenix-ui-components": "^2.16.0",
"picomatch": "^4.0.2",
"rxjs": "~7.8.0",
"three": "^0.164.1",
"tslib": "^2.3.0",
"vm": "^0.1.0",
"zone.js": "~0.14.3"
"zone.js": "~0.14.3",
"lil-gui": "^0.19.2"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^17.0.2",
Expand Down
30 changes: 17 additions & 13 deletions firebird-ng/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="#">Worflow:</a>
<a class="navbar-brand" href="#"><img src="assets/firebird/firebird-simplified-circle.png" width="32" height="32" alt="App Logo"></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand All @@ -9,7 +9,8 @@
<!--&lt;!&ndash; <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>&ndash;&gt;-->
<!-- <a [routerLink]="['/']" [queryParams]="{ geo: 'centralDetector' }" class="nav-link">Sources</a>-->
<!-- </li>-->
<!-- <li class="nav-item"><a [routerLink]="['display']" [queryParams]="{ geo: 'Setup' }" class="nav-link">Display</a></li>-->
<li class="nav-item"><a [routerLink]="['config']" class="nav-link">Configure</a></li>
<li class="nav-item"><a [routerLink]="['display']" class="nav-link">Display</a></li>
<!-- <li class="nav-item"><a [routerLink]="['/']" [queryParams]="{ geo: 'Display' }" class="nav-link">Tracking</a></li>-->

<!-- <li class="nav-item">-->
Expand All @@ -30,18 +31,21 @@
<!-- </li>-->
</ul>
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="https://github.com/eic/firebird" target="_blank">
<svg height="32" aria-hidden="true" viewBox="0 0 16 16" version="1.1" width="32" data-view-component="true" class="octicon octicon-mark-github v-align-middle">
<path d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"></path>
</svg>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://external-docs.com" target="_blank">
<img src="assets/firebird/firebird-simplified-circle.png" width="32" height="32" alt="App Logo">
</a>
<li class="nav-item" id="lil-gui-place">

</li>
<!-- <li class="nav-item">-->
<!-- <a class="nav-link" href="https://github.com/eic/firebird" target="_blank">-->
<!-- <svg height="32" aria-hidden="true" viewBox="0 0 16 16" version="1.1" width="32" data-view-component="true" class="octicon octicon-mark-github v-align-middle">-->
<!-- <path d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"></path>-->
<!-- </svg>-->
<!-- </a>-->
<!-- </li>-->
<!-- <li class="nav-item">-->
<!-- <a class="nav-link" href="https://github.com/eic/firebird#README" target="_blank">-->
<!-- <img src="assets/firebird/firebird-simplified-circle.png" width="32" height="32" alt="App Logo">-->
<!-- </a>-->
<!-- </li>-->
</ul>
</div>
</nav>
Expand Down
1 change: 1 addition & 0 deletions firebird-ng/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component } from '@angular/core';
import { RouterOutlet, RouterModule, Router} from '@angular/router';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import {BehaviorSubject, Subject} from "rxjs";
@Component({
selector: 'app-root',
standalone: true,
Expand Down
5 changes: 2 additions & 3 deletions firebird-ng/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ import {FileBrowserComponent} from "./file-browser/file-browser.component";
import {InputConfigComponent} from "./input-config/input-config.component";

export const routes: Routes = [
// { path: '', redirectTo: '/display', pathMatch: 'full' },
{ path: '', redirectTo: '/display', pathMatch: 'full' },
{ path: 'config', component: InputConfigComponent },

{
path: 'files',
loadComponent: () => import('./file-browser/file-browser.component').then(m => m.FileBrowserComponent)
},
{
path: '',
path: 'display',
loadComponent: () => import('./main-display/main-display.component').then(m => m.MainDisplayComponent)
},
];
Loading

0 comments on commit 77e53bf

Please sign in to comment.