search

thekroko / uthgard-herald

Help us build a herald.
GNU General Public License v3.0
13 stars 18 forks source link

Guild data generation, pulling guilds from json file #18

Closed OliverRadini closed 7 years ago

OliverRadini commented 7 years ago

Guild data generation

Now able to generate guild data from a script, should hopefully help with developing this feature. Should also be slightly closer to how it will work with an api.

Pulling data from url

Data pulled from static files url, /data/guilds, this is handled through ng serve currently, no need for implementation in live of course as it'll be from the api.

burfo commented 7 years ago

Sounds nice; I'll check it out. @Donutttt Please resolve the conflict.

burfo commented 7 years ago

@Donutttt I pulled together some example steps on doing a rebase. The example is using the code from your branch and it seems to work out. https://gist.github.com/burfo/f531d0ba8f0ac375c79b97b01069810d

OliverRadini commented 7 years ago

Thanks for the guide; very useful! Should hopefully now be fixed, let me know if not

burfo commented 7 years ago

Nice work on this @Donutttt; thanks for working out the issues as well.