Skip to content

Commit 76dd19b

Browse files
onmaxonmax
authored
Merge pull request #2 from DA-ETSIINF/dev
Zygote version
2 parents f5e21d3 + fb8392d commit 76dd19b

File tree

73 files changed

+1140
-662
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1140
-662
lines changed

‎dist/daetsiinf-printing-web/3rdpartylicenses.txt

Lines changed: 5 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -44,65 +44,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
4444
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
4545
THE SOFTWARE.
4646

47-
chart.js@2.7.3
48-
MIT
49-
The MIT License (MIT)
50-
51-
Copyright (c) 2018 Chart.js Contributors
52-
53-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
54-
55-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
56-
57-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
58-
59-
moment@2.22.2
60-
MIT
61-
Copyright (c) JS Foundation and other contributors
62-
63-
Permission is hereby granted, free of charge, to any person
64-
obtaining a copy of this software and associated documentation
65-
files (the "Software"), to deal in the Software without
66-
restriction, including without limitation the rights to use,
67-
copy, modify, merge, publish, distribute, sublicense, and/or sell
68-
copies of the Software, and to permit persons to whom the
69-
Software is furnished to do so, subject to the following
70-
conditions:
71-
72-
The above copyright notice and this permission notice shall be
73-
included in all copies or substantial portions of the Software.
74-
75-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
76-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
77-
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
78-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
79-
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
80-
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
81-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
82-
OTHER DEALINGS IN THE SOFTWARE.
83-
84-
webpack@4.6.0
47+
date-fns@1.29.0
8548
MIT
86-
Copyright JS Foundation and other contributors
87-
88-
Permission is hereby granted, free of charge, to any person obtaining
89-
a copy of this software and associated documentation files (the
90-
'Software'), to deal in the Software without restriction, including
91-
without limitation the rights to use, copy, modify, merge, publish,
92-
distribute, sublicense, and/or sell copies of the Software, and to
93-
permit persons to whom the Software is furnished to do so, subject to
94-
the following conditions:
95-
96-
The above copyright notice and this permission notice shall be
97-
included in all copies or substantial portions of the Software.
49+
# License
9850

99-
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
100-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
101-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
102-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
103-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
104-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
105-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
51+
date-fns is licensed under the [MIT license](http://kossnocorp.mit-license.org).
52+
Read more about MIT at [TLDRLegal](https://tldrlegal.com/license/mit-license).
10653

10754
hammerjs@2.0.8
10855
MIT
@@ -126,68 +73,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
12673
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
12774
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
12875
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
129-
THE SOFTWARE.
130-
131-
chartjs-color@2.2.0
132-
MIT
133-
Copyright (c) 2012 Heather Arthur
134-
135-
Permission is hereby granted, free of charge, to any person obtaining
136-
a copy of this software and associated documentation files (the
137-
"Software"), to deal in the Software without restriction, including
138-
without limitation the rights to use, copy, modify, merge, publish,
139-
distribute, sublicense, and/or sell copies of the Software, and to
140-
permit persons to whom the Software is furnished to do so, subject to
141-
the following conditions:
142-
143-
The above copyright notice and this permission notice shall be
144-
included in all copies or substantial portions of the Software.
145-
146-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
147-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
148-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
149-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
150-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
151-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
152-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
153-
154-
chartjs-color-string@0.5.0
155-
MIT
156-
Copyright (c) 2011 Heather Arthur <fayearthur@gmail.com>
157-
158-
Permission is hereby granted, free of charge, to any person obtaining
159-
a copy of this software and associated documentation files (the
160-
"Software"), to deal in the Software without restriction, including
161-
without limitation the rights to use, copy, modify, merge, publish,
162-
distribute, sublicense, and/or sell copies of the Software, and to
163-
permit persons to whom the Software is furnished to do so, subject to
164-
the following conditions:
165-
166-
The above copyright notice and this permission notice shall be
167-
included in all copies or substantial portions of the Software.
168-
169-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
170-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
171-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
172-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
173-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
174-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
175-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
176-
177-
color-name@1.1.3
178-
MIT
179-
The MIT License (MIT)
180-
Copyright (c) 2015 Dmitry Ivanov
181-
182-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
183-
184-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
185-
186-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
187-
188-
date-fns@1.29.0
189-
MIT
190-
# License
191-
192-
date-fns is licensed under the [MIT license](http://kossnocorp.mit-license.org).
193-
Read more about MIT at [TLDRLegal](https://tldrlegal.com/license/mit-license).
76+
THE SOFTWARE.

‎dist/daetsiinf-printing-web/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<!DOCTYPE html><html lang="en"><head>
22
<meta charset="utf-8">
3-
<title>DaetsiinfPrintingWeb</title>
3+
<title>printf.es</title>
44
<base href="./">
55
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
66
<link href="https://fonts.googleapis.com/css?family=Lato:400,700,900|Oswald=300,400,600" rel="stylesheet">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<link rel="icon" type="image/x-icon" href="favicon.ico">
9-
<link rel="stylesheet" href="styles.af504832399c3fb1bc7d.css"></head>
9+
<link rel="stylesheet" href="styles.d0f8d79fe56230d112de.css"></head>
1010

1111
<body>
1212
<app-root></app-root>
1313

1414

1515

16-
<script type="text/javascript" src="runtime.6afe30102d8fe7337431.js"></script><script type="text/javascript" src="polyfills.2be085a4b57f2f5d859b.js"></script><script type="text/javascript" src="main.9d37214abd159f2fe20d.js"></script></body></html>
16+
<script type="text/javascript" src="runtime.6afe30102d8fe7337431.js"></script><script type="text/javascript" src="polyfills.2be085a4b57f2f5d859b.js"></script><script type="text/javascript" src="main.c7eadfdeef049cb39f6c.js"></script></body></html>

‎dist/daetsiinf-printing-web/main.9d37214abd159f2fe20d.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/daetsiinf-printing-web/main.c7eadfdeef049cb39f6c.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/daetsiinf-printing-web/styles.af504832399c3fb1bc7d.css renamed to ‎dist/daetsiinf-printing-web/styles.d0f8d79fe56230d112de.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<router-outlet></router-outlet>
22
<app-notifications></app-notifications>
3-
<app-terminal [hidden]="true"></app-terminal>
3+
<app-terminal [hidden]="showTerminal()"></app-terminal>

‎src/app/app.component.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Component, OnInit, HostListener } from '@angular/core';
2+
import { AppService } from './app.service';
23

34
@Component({
45
selector: 'app-root',
@@ -9,6 +10,8 @@ export class AppComponent implements OnInit {
910
deviceWidth: 'small' | 'large';
1011
size: number;
1112

13+
constructor(private appService: AppService) {}
14+
1215
ngOnInit() {
1316
this.widthStatus(window.innerWidth);
1417
}
@@ -22,4 +25,8 @@ export class AppComponent implements OnInit {
2225
onResize(event) {
2326
this.widthStatus(event.target.innerWidth);
2427
}
28+
29+
showTerminal(): boolean {
30+
return !this.appService.showTerminal;
31+
}
2532
}

‎src/app/app.module.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ import { VersionsComponent } from './versions/versions.component';
3131
import { CreateFolderComponent } from './files/create-folder/create-folder.component';
3232
import { TerminalComponent } from './terminal/terminal.component';
3333
import { NotificationsComponent } from './notifications/notifications.component';
34+
import { TextInputComponent } from './ui-kit/text-input/text-input.component';
35+
import { CheckboxComponent } from './ui-kit/checkbox/checkbox.component';
3436
@NgModule({
3537
declarations: [
3638
AppComponent,
@@ -58,7 +60,9 @@ import { NotificationsComponent } from './notifications/notifications.component'
5860
VersionsComponent,
5961
CreateFolderComponent,
6062
TerminalComponent,
61-
NotificationsComponent
63+
NotificationsComponent,
64+
TextInputComponent,
65+
CheckboxComponent
6266
],
6367
imports: [BrowserModule, ModuleRouting, HttpClientModule, FormsModule],
6468
providers: [

‎src/app/app.routing.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,30 @@ const routes: Routes = [
2626
component: FilesComponent,
2727
canActivate: [AuthGuard]
2828
},
29+
/*
2930
{
3031
path: 'shared-with-me',
3132
component: FilesComponent,
3233
canActivate: [AuthGuard]
3334
},
35+
*/
3436
{
3537
path: 'profile',
3638
component: ProfileComponent,
3739
canActivate: [AuthGuard]
3840
},
41+
/*
3942
{
4043
path: 'funds',
4144
component: FundsComponent,
4245
canActivate: [AuthGuard]
4346
},
47+
*/
4448
{ path: '', pathMatch: 'full', redirectTo: '/my-files' },
4549
{
4650
path: 'quick',
4751
pathMatch: 'full',
48-
component: QuickPrintComponent,
49-
canActivate: [AuthGuard]
52+
component: QuickPrintComponent
5053
},
5154
{ path: 'tutorial', pathMatch: 'full', component: TutorialComponent },
5255
{ path: 'versions', pathMatch: 'full', component: VersionsComponent },

‎src/app/app.service.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@ export class AppService {
2727
}
2828
];
2929

30-
constructor() { }
30+
showTerminal = false;
31+
32+
constructor() {}
3133
}

‎src/app/files/change-name/change-name.component.css

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
width: 100vw;
55
top: 0;
66
left: 0;
7-
background: rgba(0, 0, 0, .4);
87
z-index: 1000;
98
display: flex;
109
align-items: center;
1110
justify-content: center;
1211
transition: .2s all ease;
1312
opacity: 1;
1413
animation: opacity .2s ease;
14+
background: rgba(0, 0, 0, .4);
1515
}
1616

1717
@keyframes opacity {
@@ -28,7 +28,7 @@
2828
max-width: 400px;
2929
width: 60vw;
3030
height: 20vh;
31-
background: var(--bck);
31+
background: var(--neutrals-10);
3232
padding: 25px 30px;
3333
z-index: 1001;
3434
border-radius: 4px;
@@ -53,7 +53,7 @@
5353
display: flex;
5454
justify-content: space-between;
5555
align-items: center;
56-
color: var(--dark-4);
56+
color: var(--neutrals-2);
5757
}
5858

5959
.change-name header span {
@@ -69,19 +69,18 @@
6969
width: 100%;
7070
margin: 0 auto;
7171
border: 0;
72-
color: var(--dark-4);
73-
border-bottom: 2px solid var(--dark-3);
72+
color: var(--neutrals-2);
73+
border-bottom: 1px solid var(--neutrals-2);
7474
background: none;
7575
font-size: 17px;
7676
padding: 4px;
7777
margin-top: 50px;
7878
outline: none;
79-
transition: .1s all ease;
8079
}
8180

8281
.change-name input:focus {
8382
border: none;
84-
border-bottom: 4px solid var(--blue);
83+
border-bottom: 1px solid var(--primary-3);
8584
}
8685

8786
.change-name .buttons {
@@ -94,11 +93,11 @@
9493
.change-name .buttons button {
9594
font-size: 13px;
9695
font-weight: 700;
97-
background: linear-gradient(90deg, var(--blue), var(--purple));
96+
background: var(--primary-3);
9897
border: none;
9998
padding: 9px 21px;
10099
border-radius: 10px;
101-
color: var(--white);
100+
color: var(--neutrals-10);
102101
text-transform: uppercase;
103102
height: 33px;
104103
transition: .2s all ease;
@@ -108,7 +107,7 @@
108107

109108
.change-name .buttons .cancel {
110109
background: none;
111-
color: var(--dark-3);
110+
color: var(--neutrals-1);
112111
margin-right: 10px;
113112
}
114113

@@ -133,7 +132,7 @@
133132
}
134133

135134
.change-name input:focus {
136-
border-bottom-width: 2px;
135+
border-bottom-width: 1px;
137136
}
138137

139138
.change-name .buttons button {

0 commit comments

Comments
 (0)