Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Front edit #19

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ProiectMDS/src/app/api.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ export class ApiService {
// .pipe(shareReplay(1));
}

createTeam(name): Observable<any> {
return this.http.post("http://localhost:8000/api/v1/teams/", name);
createTeam(teamData): Observable<any> {
return this.http.post("http://localhost:8000/api/v1/teams/new", teamData);
}

}
93 changes: 9 additions & 84 deletions ProiectMDS/src/app/login/login.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ body {
/* background-image: url("https://cdn.pixabay.com/photo/2019/03/03/20/23/flowers-4032775_1280.png"); */
background-image: url(../imgs/exploreTheWorld.jpg);
background-size: cover;
background-color: mediumseagreen;
height:100vh;
}

.container1 {
align-content: center;
margin: auto;
width: 40%;
border: 1px solid aquamarine;
/* border: 1px solid aquamarine; */
background-color: rgb(192,192,192);
border-radius: 20px;
padding: 55px;
background: rgb(152, 205, 187);
padding: 45px;
margin-top: 25px;
}

Expand All @@ -27,8 +27,8 @@ body {
}

.b {
background-color: cadetblue;
border: 2px solid aquamarine;
background-color: rgb(192,192,192);
border: 4px solid #ccc;
border-radius: 10px;
color: rgb(26, 62, 93);
padding: 10px;
Expand All @@ -39,12 +39,12 @@ body {
margin: 4px 2px;
cursor: pointer;
position: absolute;
top: 55%;
top: 65%;
left: 45%;
}

.b:hover{
background-color: rgb(123, 200, 203);
button:hover{
background-color: rgb(169,169,169);
}

input{
Expand Down Expand Up @@ -128,81 +128,6 @@ body {
}


.clearfix:before,
.clearfix:after,
.dl-horizontal dd:before,
.dl-horizontal dd:after,
.container:before,
.container:after,
.container-fluid:before,
.container-fluid:after,
.row:before,
.row:after,
.form-horizontal .form-group:before,
.form-horizontal .form-group:after,
.btn-toolbar:before,
.btn-toolbar:after,
.btn-group-vertical > .btn-group:before,
.btn-group-vertical > .btn-group:after,
.nav:before,
.nav:after,
.navbar:before,
.navbar:after,
.navbar-header:before,
.navbar-header:after,
.navbar-collapse:before,
.navbar-collapse:after,
.pager:before,
.pager:after,
.panel-body:before,
.panel-body:after,
.modal-footer:before,
.modal-footer:after {
display: table;
content: " ";
}
.clearfix:after,
.dl-horizontal dd:after,
.container:after,
.container-fluid:after,
.row:after,
.form-horizontal .form-group:after,
.btn-toolbar:after,
.btn-group-vertical > .btn-group:after,
.nav:after,
.navbar:after,
.navbar-header:after,
.navbar-collapse:after,
.pager:after,
.panel-body:after,
.modal-footer:after {
clear: both;
}

ul,
ol {
margin-top: 0;
margin-bottom: 10px;
}
ul ul,
ol ul,
ul ol,
ol ol {
margin-bottom: 0;
}
.list-unstyled {
padding-left: 0;
list-style: none;
text-decoration:none;
}

.list-unstyled li a {
text-decoration:none;
}





.footer-container {
padding-top: 35px;
Expand Down
11 changes: 5 additions & 6 deletions ProiectMDS/src/app/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@
<legend>Login</legend>
<div class="form-field">
<label>Email:</label>
<input name="email" formControlName="email">
<input class="inp" name="email" formControlName="email">
</div>

<div class="form-field">
<label>Password:</label>
<input name="password" formControlName="password" type="password">
<input class="inp" name="password" formControlName="password" type="password">
</div>
</fieldset>

</fieldset><br>
<div class="form-buttons">
<button class="button button-primary"
(click)="login()">Login</button>
<button class="b" (click)="login()">Login</button>
</div>

</form>
Expand Down
7 changes: 3 additions & 4 deletions ProiectMDS/src/app/quiz/quiz.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
.container {
margin: auto;
width: 50%;
border: 1px solid aquamarine;
border-radius: 10px;;
/* border: 1px solid aquamarine; */
background-color: rgb(220,220,220);
border-radius: 20px;
padding: 30px;
background: rgb(152, 205, 187);
margin-top: 30px;
}

body {
/* background-image: url("https://cdn.pixabay.com/photo/2020/07/08/11/07/imagination-5383470_1280.jpg"); */
background-image: linear-gradient(rgba(0,0,0,0.5), rgba(0,0,0,0.6)), url(src\app\imgs\ceasuri.jpg);
background-size: cover;
background-color: forestgreen;
height: 100vh;
}

Expand Down
102 changes: 3 additions & 99 deletions ProiectMDS/src/app/register-player/register-player.component.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
body {
/* background-image: url("https://cdn.pixabay.com/photo/2019/03/03/20/23/flowers-4032775_1280.png"); */
background-image: url(../imgs/exploreTheWorld.jpg);
background-color: mediumseagreen;
background-size: cover;
height: 100vh;
}


Expand Down Expand Up @@ -68,7 +69,7 @@ footer {
}

footer ul {
margin-bottom: 5em;
/* margin-bottom: 5em; */
}

/* footer address strong {
Expand All @@ -88,26 +89,6 @@ footer {
}


/*contact page*/
section#contact form {
padding-top: 9rem;
padding-bottom: 3rem;
}

.hidden-element {
display: none;
}

#team {
margin-top: 3rem;
}

.container {
padding-right: 15px;
padding-left: 15px;
margin-right: auto;
margin-left: auto;
}

.col-sm-2, .col-sm-4 {
position: relative;
Expand All @@ -129,83 +110,6 @@ section#contact form {
}


.clearfix:before,
.clearfix:after,
.dl-horizontal dd:before,
.dl-horizontal dd:after,
.container:before,
.container:after,
.container-fluid:before,
.container-fluid:after,
.row:before,
.row:after,
.form-horizontal .form-group:before,
.form-horizontal .form-group:after,
.btn-toolbar:before,
.btn-toolbar:after,
.btn-group-vertical > .btn-group:before,
.btn-group-vertical > .btn-group:after,
.nav:before,
.nav:after,
.navbar:before,
.navbar:after,
.navbar-header:before,
.navbar-header:after,
.navbar-collapse:before,
.navbar-collapse:after,
.pager:before,
.pager:after,
.panel-body:before,
.panel-body:after,
.modal-footer:before,
.modal-footer:after {
display: table;
content: " ";
}

.clearfix:after,
.dl-horizontal dd:after,
.container:after,
.container-fluid:after,
.row:after,
.form-horizontal .form-group:after,
.btn-toolbar:after,
.btn-group-vertical > .btn-group:after,
.nav:after,
.navbar:after,
.navbar-header:after,
.navbar-collapse:after,
.pager:after,
.panel-body:after,
.modal-footer:after {
clear: both;
}

ul,
ol {
margin-top: 0;
margin-bottom: 10px;
}

ul ul,
ol ul,
ul ol,
ol ol {
margin-bottom: 0;
}

.list-unstyled {
padding-left: 0;
list-style: none;
text-decoration: none;
}

.list-unstyled li a {
text-decoration: none;
}




.footer-container {
padding-top: 35px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<button (click)="registerPlayer" class="b">Register as Player</button>
</div>
</body>
</body>

<footer>
<div class="footer-container">
Expand Down
2 changes: 1 addition & 1 deletion ProiectMDS/src/app/register/register.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ body {
/* background-image: url("https://cdn.pixabay.com/photo/2019/03/03/20/23/flowers-4032775_1280.png"); */
background-image: url(../imgs/exploreTheWorld.jpg);
background-size: cover;
height: 100%;
height: 100vh;
}

.container1 {
Expand Down
2 changes: 0 additions & 2 deletions ProiectMDS/src/app/register/register.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@
<input [(ngModel)]="register.email" class="inp" placeholder="email">
<input [(ngModel)]="register.username" class="inp" placeholder="username">
<input [(ngModel)]="register.password" class="inp" placeholder="password" type="password">

<button (click)="registerCompany()" class="b">Register as Company</button>
</div>
</body>
<br><br><br><br><br><br><br><br>

<footer>
<div class="footer-container">
Expand Down
11 changes: 9 additions & 2 deletions ProiectMDS/src/app/teams/teams.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,16 @@ <h1>Teams</h1>
<div class="main">
<h3>Creeaza echipe introducandu-le numele:</h3>
<div class="input-fields">
<input name="name" ngModel placeholder="Name" id="name" type="text" class="input-field" />
<input name="name" ngModel placeholder="Name" id="name" type="text" class="input-field" /><br>
<input name="activity" ngModel placeholder="Activity" id="name" type="text" class="input-field" />
<!-- <select id="cars" name="cars">
<option value="volvo">Volvo</option>
<option value="saab">Saab</option>
<option value="fiat">Fiat</option>
<option value="audi">Audi</option>
</select> -->
</div>
<button (click)="createTeam(name)">Add Team </button>
<button (click)="createTeam">Add Team </button>
</div>

<div class = "teams">
Expand Down
Loading