Merge branch 'master' of Software_Engineering_I/greenvironment-frontend into niklas_dev2

master
Max_ES 5 years ago committed by Gitea
commit f28946019c

@ -1,9 +1,9 @@
<div id="about"> <div id="about">
<div id="aboutcontainer"> <div id="aboutcontainer">
<h1>What´s Greenvironment?</h1> <h1>What's Greenvironment?</h1>
<h2>Hello Greenvironment!</h2> <h2>Hello Greenvironment!</h2>
<p>We, the greenviroment team want to create a netwok for environmentalists who care for our nature and our planet as much as we do.</p> <p>We, the greenviroment team want to create a netwok for environmentalists who care for our nature and our planet as much as we do.</p>
<p>We believe, that together we can do amazing things to protect our environment and keep it clean and green.</p> <p>We believe, that together we can do amazing things to protect our environment and keep it clean and green.</p>
<a href="/register">You aren´t part of greenvironment yet? - join us here</a> <a href="/register">You aren't part of greenvironment yet? - join us here</a>
</div> </div>
</div> </div>

@ -16,7 +16,7 @@
<p *ngIf="errorOccurred">{{errorMessage}}</p> <p *ngIf="errorOccurred">{{errorMessage}}</p>
<br> <br>
<br> <br>
<a href="/register">You aren´t part of greenvironment yet? - join us here</a> <a href="/register">You aren't part of greenvironment yet? - join us here</a>
</div> </div>
</div> </div>

@ -23,7 +23,7 @@
<td>{{user.level}} ({{rankname}})</td> <td>{{user.level}} ({{rankname}})</td>
</tr> </tr>
</table> </table>
<h2>What´s the level?</h2> <h2>What does the level mean?</h2>
<p>There are different levels you can reach through green behaviour. <p>There are different levels you can reach through green behaviour.
Collect 100 points to level up! The levels are called: Collect 100 points to level up! The levels are called:
</p> </p>

@ -8,7 +8,7 @@ export class Actionlist{
{ id: 5, name: "reduce waste", points: 5 }, { id: 5, name: "reduce waste", points: 5 },
{ id: 6, name: "reduce CO2 emission", points: 5 }, { id: 6, name: "reduce CO2 emission", points: 5 },
{ id: 7, name: "eat a vegetarian meal", points: 2 }, { id: 7, name: "eat a vegetarian meal", points: 2 },
{ id: 8, name: "don´t use the car", points: 10 }, { id: 8, name: "don't use the car", points: 10 },
{ id: 9, name: "buy fair trade/ local product", points: 1 }, { id: 9, name: "buy fair trade/ local product", points: 1 },
{ id: 10, name: "donate money to an environment organisation ", points: 3 }, { id: 10, name: "donate money to an environment organisation ", points: 3 },
]; ];

Loading…
Cancel
Save