diff --git a/articles/__init__.py b/articles/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/monerojnet/admin.py b/articles/admin.py similarity index 100% rename from monerojnet/admin.py rename to articles/admin.py diff --git a/articles/apps.py b/articles/apps.py new file mode 100644 index 0000000..6318648 --- /dev/null +++ b/articles/apps.py @@ -0,0 +1,4 @@ +from django.apps import AppConfig + +class ArticlesConfig(AppConfig): + name = 'articles' diff --git a/articles/forms.py b/articles/forms.py new file mode 100644 index 0000000..c71c4ff --- /dev/null +++ b/articles/forms.py @@ -0,0 +1,7 @@ +from articles.models import * +from django import forms + +class ArticleForm(forms.ModelForm): + class Meta: + model = Article + fields = ['title', 'subtitle', 'thumbnail', 'text'] diff --git a/articles/models.py b/articles/models.py new file mode 100644 index 0000000..4371ddc --- /dev/null +++ b/articles/models.py @@ -0,0 +1,24 @@ +from django.db import models +from django.contrib.auth.models import User + +# Create your models here. +class Article(models.Model): + owner = models.ForeignKey(User, on_delete=models.CASCADE) + date_added = models.DateTimeField(auto_now_add=True) + date_updated = models.DateField(null=True, blank=True) + date_published = models.DateField(null=True, blank=True) + author = models.CharField(max_length=50) + status = models.CharField(max_length=20) + review = models.TextField(null=True, blank=True) + url = models.CharField(max_length=200) + #formular + title = models.CharField(max_length=150) + subtitle = models.CharField(max_length=100) + thumbnail = models.CharField(max_length=100) + text = models.TextField() + + class Meta: + verbose_name_plural = 'articles' + + def __str__(self): + return self.title \ No newline at end of file diff --git a/articles/templates/articles/article.html b/articles/templates/articles/article.html new file mode 100644 index 0000000..c34dd00 --- /dev/null +++ b/articles/templates/articles/article.html @@ -0,0 +1,115 @@ +{% extends "users/base.html" %} +{% block header %} + +{{ article.title }} + + + +{% endblock header %} +{% block content %} + +{% load static %} + + +
+
+ + + +
+
+
+
+
+
+ {% if article.status == 'Pending approval' %} +
+
Pending approval
 +
+ {% elif article.status == 'Reviewed' %} +
+
Reviewed: {{ article.review }}
 +
+ {% endif %} +
+ {% if article.status == 'Published' %} +

Published by {{ article.owner }}, {{ article.date_published }}

+ {% else %} +

+ Created {{ article.date_added }}
+ Updated {{ article.date_updated }}
+ Edit - + Delete +

+ {% endif %} +

{{ article.title }}

+

{{ article.subtitle }}

+
+

{{ article.text | safe}}

+
+ + +
+
+
+
+
+ +
+
+ + +
+ + + + +{% endblock content %} \ No newline at end of file diff --git a/articles/templates/articles/articles.html b/articles/templates/articles/articles.html new file mode 100644 index 0000000..cc1d1d4 --- /dev/null +++ b/articles/templates/articles/articles.html @@ -0,0 +1,248 @@ +{% extends "users/base.html" %} +{% block header %} + +Moneroj.net - Articles + + + +{% endblock header %} +{% block content %} + +{% load static %} + + +
+
+ + +
+ + +
+
+ {% for article in articles %} + + {% if article.count == 0 %} +
+
+
+

{{ article.title }}

+

+ Article by {{ article.owner.username }}, {{ article.date_published }}

{{ article.text | safe }} +

+
+
+
+
+ {% csrf_token %} + {% if message %} + {% if message == 'Subscription successful!' %} +
+
{{ message }}
 +
+ {% else %} +
+
{{ message }}
 +
+ {% endif %} + {% endif %} +
+

+

Subscribe


+ +
+ This field must be filled +
+ + +
+
+
+
+
+ +
+ + {% elif article.count < 7 %} +
+
+ +
+
{{ article.title }}
+

{{ article.text | safe }}

+
Article by {{ article.owner.username }}, {{ article.date_published }}
+
+
+
+ + {% elif article.count == 7 %} +
+ +
+
+
+ {% csrf_token %} + {% if message %} + {% if message == 'Subscription successful!' %} +
+
{{ message }}
 +
+ {% else %} +
+
{{ message }}
 +
+ {% endif %} + {% endif %} +
+

+

Subscribe


+ +
+ This field must be filled +
+ + +
+
+
+
+
+

{{ article.title }}

+

+ Article by {{ article.owner.username }}, {{ article.date_published }}

{{ article.text | safe }} +

+
+
+
+
+
+ + {% elif article.count > 7 %} +
+
+ +
+
{{ article.title }}
+

{{ article.text | safe }}

+
Article by {{ article.owner.username }}, {{ article.date_published }}
+
+
+
+ + {% endif %} + {% endfor %} + + +
+
+
+

+

Images were taken from https://monero.graphics/ under CC BY-SA 4.0 license, check their work and donate them some Moneroj.

+
+
+
+ +
+
+ + + +
+ + +{% endblock content %} + + + + + + + diff --git a/articles/templates/articles/edit_article.html b/articles/templates/articles/edit_article.html new file mode 100644 index 0000000..dd3ae36 --- /dev/null +++ b/articles/templates/articles/edit_article.html @@ -0,0 +1,166 @@ +{% extends "users/base.html" %} +{% block header %} + +Moneroj.net - Edit Article + + + +{% endblock header %} +{% block content %} + +


+
+ +

Write a new article:


+
+ {% csrf_token %} +
+
+ + +
+ OK +
+
+ This field is required +
+
+
+ + +
+
+ + +
+ OK +
+
+ This field is required +
+
+
+ +
+
+ + +
+ OK +
+
+ Preencha esse campo +
+
+
+ +
+
+ + +
+ OK +
+
+ This field is required +
+
+
+
+
+ + +
+
+
+ +
+ + +


+ +{% endblock content %} + + + + + + + diff --git a/articles/templates/articles/images.html b/articles/templates/articles/images.html new file mode 100644 index 0000000..d00f1fa --- /dev/null +++ b/articles/templates/articles/images.html @@ -0,0 +1,162 @@ +{% extends "users/base.html" %} +{% block header %} + +Moneroj.net - Choose your image + +{% endblock header %} +{% block content %} + + +{% load static %} + +
+
+ +
+
+
+ +
+

monero-cat-untraceable

+
+
+
+ +
+
+ +
+

monero-geometric-logo

+
+
+
+ +
+
+ +
+

monero-is-the-best-regardless-sticker

+
+
+
+ +
+
+ +
+

monero-mining-4-privacy

+
+
+
+ +
+
+ +
+

monero-support-your-local-cypherpunk

+
+
+
+ +
+
+ +
+

monero-the-corrupt-fear-us

+
+
+
+ +
+
+ +
+

monero-trace

+
+
+
+ +
+
+ +
+

monero-will-survive-tyranny-sticker

+
+
+
+ +
+
+ +
+

monero-you-need-no-portfolio

+
+
+
+ +
+
+ +
+

price-action

+
+
+
+ +
+
+ +
+

private-by-default

+
+
+
+ +
+
+ +
+

private-electronic-money

+
+
+
+ +
+
+ +
+

stats

+
+
+
+ +
+
+ +
+

ussse-monero

+
+
+
+ +
+
+ +
+

why-speculate

+
+
+
+ +
+
+
+ +{% endblock content %} + + + + + + + diff --git a/articles/templates/articles/new_article.html b/articles/templates/articles/new_article.html new file mode 100644 index 0000000..cdb110a --- /dev/null +++ b/articles/templates/articles/new_article.html @@ -0,0 +1,141 @@ +{% extends "users/base.html" %} +{% block header %} + +Moneroj.net - New Article + + + +{% endblock header %} +{% block content %} + +


+
+ +

Write a new article:


+
+ {% csrf_token %} +
+
+ + +
+ OK +
+
+ This field is required +
+
+
+ +
+
+ + +
+ OK +
+
+ This field is required +
+
+
+ +
+
+ + +
+ OK +
+
+ Preencha esse campo +
+
+
+ +
+
+ + +
+ OK +
+
+ This field is required +
+
+
+
+
+ + +
+
+
+

+

Tips for a better article:


+

All fields are required. Write on a notepad and save locally your article before submitting, otherwise you might + lose all your work. Use simple sentences for the Subtitle, five words at maximum. Select any thumbnail image, + this serves only as a decoration for the article, it doesn't have to be related to the article. + You can use HTML tags to format the article: +

+

+ +
+ + +


+ +{% endblock content %} + + + + + + + diff --git a/articles/templates/articles/write.html b/articles/templates/articles/write.html new file mode 100644 index 0000000..8b13310 --- /dev/null +++ b/articles/templates/articles/write.html @@ -0,0 +1,364 @@ +{% extends "users/base.html" %} +{% block header %} + +Moneroj.net - Profile + + + +{% endblock header %} +{% block content %} + + +
+
+
+
+

Start writing great articles!

+

Write and submit your articles for approval.

+
+ +
+
+

+

You are currently: +
+
+ {% if request.user.profile.type == 'user' %} + User / writer + {% elif request.user.profile.type == 'editor' %} + Editor and writer + {% elif request.user.profile.type == 'admin' %} + Administrator + {% endif %} +

+
+
+ +
+
+

+

Write new article:


+ +
+
+ +
+
+
+ + +
+ +

+
+

My Articles

+
+ + + + + + + + + + + + + {% for article in articles %} + + + + + + + + + + + + {% endfor %} + +
TitleCreatedUpdatedPublishedStatus
View
Edit
Delete
{{ article.title }}{{ article.date_added }}{{ article.date_updated }}{{ article.date_published }}{{ article.status }} +
+ X +
+ 		+
+ X + +
+ 		+
+ X + + + +
+
+ + {% if request.user.profile.type == 'editor' %} +

+
+

Review Articles

+
+ + + + + + + + + + + + + {% for review in reviews %} + + + + + + + + + + + + {% endfor %} + +
TitleCreatedUpdatedPublishedStatus
View
Publish
Review
{{ review.title }}{{ review.date_added }}{{ review.date_updated }}{{ review.date_published }}{{ review.status }} +
+ X +
+ 		+
+ X +
+ 		+
+ X +
+
+ + {% elif request.user.profile.type == 'admin' %} +

+
+

Review Articles

+
+ + + + + + + + + + + + + + {% for review in reviews %} + + + + + + + + + + + + + {% endfor %} + +
TitleWriterCreatedUpdatedStatus
View
Publish
Review
Delete
{{ review.title }}{{ review.owner.username }}{{ review.date_added }}{{ review.date_updated }}{{ review.status }} +
+ X +
+ 		+
+ X +
+ 		+
+ X + +
+ 		+
+ X + + + +
+
+ +

+
+

Published Articles

+
+ + + + + + + + + + + + {% for publish in published %} + + + + + + + + + + + {% endfor %} + +
TitleWriterCreatedUpdatedStatus
View
Delete
{{ publish.title }}{{ publish.owner.username }}{{ publish.date_added }}{{ publish.date_updated }}{{ publish.status }} +
+ X +
+ 		+
+ X + + + +
+
+ {% endif %} + +
+


+ +{% endblock content %} + + + + + + + diff --git a/monerojnet/tests.py b/articles/tests.py similarity index 100% rename from monerojnet/tests.py rename to articles/tests.py diff --git a/articles/urls.py b/articles/urls.py new file mode 100644 index 0000000..35a1507 --- /dev/null +++ b/articles/urls.py @@ -0,0 +1,21 @@ +from django.urls import path +from django.contrib.auth import views as auth_views +from . import views + +urlpatterns = [ + + # Pages URLs + # Everyone can use these + path('articles/', views.articles, name="articles"), + path('article//', views.article, name="article"), + + # URLs to articles writing and edit, etc + # Only registered users can use these + path('write/', views.write, name="write"), + path('new_article/', views.new_article, name="new_article"), + path('images/', views.images, name="images"), + path('edit_article//', views.edit_article, name="edit_article"), + path('publish_article//', views.publish_article, name="publish_article"), + path('delete_article//', views.delete_article, name="delete_article"), + +] \ No newline at end of file diff --git a/articles/views.py b/articles/views.py new file mode 100644 index 0000000..3fc0265 --- /dev/null +++ b/articles/views.py @@ -0,0 +1,244 @@ +from django.shortcuts import render +from django.http import HttpResponseRedirect +from django.urls import reverse +from .models import * +from .forms import * +from users.models import * +from users.forms import * +from users.views import update_visitors +from django.contrib.auth import logout, login, authenticate +from django.contrib.auth.forms import UserCreationForm +from django.contrib.auth.decorators import login_required +import datetime +from datetime import date, timedelta + +########################################### +# General visitors' pages +########################################### + +def articles(request): + update_visitors(False) + articles = Article.objects.filter(status="Published").order_by('-id') + first = True + thumbnail = '' + count = 0 + for article in articles: + if first: + thumbnail = article.thumbnail + thumbnail = thumbnail.replace('400x300', '1920x1080') + first = False + article.thumbnail = 'img/articles/' + article.thumbnail + if len(article.title) > 100: + article.title = article.title[:100] + '...' + article.count = count + if count != 5 and count != 0: + article.text = article.text[:400] + '...' + else: + article.text = article.text[:600] + '...' + count += 1 + + if request.method != 'POST': + #no data, go back to articles section + form = SubscriberForm() + message = False + else: + #e-mail submitted + form = SubscriberForm(data=request.POST) + if form.is_valid(): + new_subscriber = form.save(commit=False) + new_subscriber.save() + message = 'Subscription successful!' + else: + message = 'Something went wrong!' + + print(thumbnail) + + context = {'page': 'article', 'articles': articles, 'form': form, 'message': message, 'thumbnail': thumbnail} + return render(request, 'articles/articles.html', context) + +def article(request, identification): + update_visitors(False) + try: + article = Article.objects.get(id=identification) + except: + try: + identification = identification.replace('-', ' ') + article = Article.objects.get(title=identification) + except: + return render(request, 'users/error.html') + + article.thumbnail = article.thumbnail.replace('400x300', '1920x1080') + + if article.status == 'Published': + context = {'page': 'article', 'article': article} + return render(request, 'articles/article.html', context) + else: + if request.user.username != "Administrador" and request.user.username != "Morpheus" and request.user != article.owner and request.user.profile.type != 'editor': + return render(request, 'users/error.html') + else: + context = {'page': 'article', 'article': article} + return render(request, 'articles/article.html', context) + +########################################### +# Required login - Users +########################################### + +@login_required +def images(request): + update_visitors(False) + context = {'page': 'article'} + return render(request, 'articles/images.html', context) + +@login_required +def write(request): + update_visitors(False) + articles = Article.objects.filter(author=request.user).order_by('-id') + for article in articles: + try: + article.date_added = datetime.datetime.strftime(article.date_added, '%d/%m/%Y') + article.date_updated = datetime.datetime.strftime(article.date_updated, '%d/%m/%Y') + except: + pass + try: + article.date_published = datetime.datetime.strftime(article.date_published, '%d/%m/%Y') + except: + pass + article.title = article.title[:50] + '...' + + if request.user.profile.type == 'editor': + reviews = Article.objects.filter(status="Pending approval").exclude(author=request.user) + for review in reviews: + try: + review.date_added = datetime.datetime.strftime(review.date_added, '%d/%m/%Y') + review.date_updated = datetime.datetime.strftime(review.date_updated, '%d/%m/%Y') + except: + pass + try: + review.date_published = datetime.datetime.strftime(review.date_published, '%d/%m/%Y') + except: + pass + review.title = review.title[:50] + '...' + + context = {'page': 'article', 'articles': articles, 'reviews': reviews} + + if request.user.profile.type == "admin": + reviews = Article.objects.filter(status="Pending approval") + for review in reviews: + try: + review.date_added = datetime.datetime.strftime(review.date_added, '%d/%m/%Y') + review.date_updated = datetime.datetime.strftime(review.date_updated, '%d/%m/%Y') + except: + pass + try: + review.date_published = datetime.datetime.strftime(review.date_published, '%d/%m/%Y') + except: + pass + review.title = review.title[:50] + '...' + + published = Article.objects.filter(status="Published") + for publish in published: + try: + publish.date_added = datetime.datetime.strftime(publish.date_added, '%d/%m/%Y') + publish.date_updated = datetime.datetime.strftime(publish.date_updated, '%d/%m/%Y') + except: + pass + try: + publish.date_published = datetime.datetime.strftime(publish.date_published, '%d/%m/%Y') + except: + pass + publish.title = publish.title[:50] + '...' + + context = {'page': 'article', 'articles': articles, 'reviews': reviews, 'published': published} + + else: + context = {'page': 'article', 'articles': articles} + return render(request, 'articles/write.html', context) + +@login_required +def new_article(request): + update_visitors(False) + if request.method != 'POST': + #create new page with blank form + form = ArticleForm() + else: + #process data and submit article + form = ArticleForm(data=request.POST) + if form.is_valid(): + new_article = form.save(commit=False) + new_article.author = request.user.username + articles = Article.objects.filter(author=new_article.author).filter(status='Pending approval') + count = 0 + if articles: + for article in articles: + count += 1 + if count >= 5: + return HttpResponseRedirect(reverse('articles:write')) + new_article.date_updated = datetime.datetime.now() + new_article.owner = request.user + new_article.url = new_article.title.replace(' ', '-') + new_article.status = 'Pending approval' + new_article.save() + return HttpResponseRedirect(reverse('articles:write')) + + context = {'form': form, 'page': 'article'} + return render(request, 'articles/new_article.html', context) + +@login_required +def edit_article(request, identification): + update_visitors(False) + try: + article = Article.objects.get(id=identification) + except: + return render(request, 'users/error.html') + if request.user.profile.type != "admin" and request.user != article.owner: + return render(request, 'users/error.html') + + if request.method != 'POST': + #no data submitted, load saved data + form = ArticleForm(instance=article) + else: + #data submitted, now save it + form = ArticleForm(instance=article, data=request.POST) + if form.is_valid(): + new_article = form.save(commit=False) + new_article.author = request.user.username + new_article.date_updated = date.today() + new_article.owner = request.user + new_article.url = new_article.title.replace(' ', '-') + new_article.status = 'Pending approval' + new_article.save() + return HttpResponseRedirect(reverse('articles:write')) + + context = {'form': form, 'article': article, 'page': 'article'} + return render(request, 'articles/edit_article.html', context) + +@login_required +def delete_article(request, identification): + update_visitors(False) + try: + article = Article.objects.get(id=identification) + except: + return render(request, 'users/error.html') + if request.user.profile.type != "admin" and request.user != article.owner: + return render(request, 'users/error.html') + + article.delete() + return HttpResponseRedirect(reverse('articles:write')) + +@login_required +def publish_article(request, identification): + update_visitors(False) + try: + article = Article.objects.get(id=identification) + except: + return render(request, 'users/error.html') + if request.user.profile.type != "admin" and request.user.profile.type != "editor": + return render(request, 'users/error.html') + + if request.user.profile.type == article.owner.profile.type and request.user.profile.type != 'admin': + return render(request, 'users/error.html') + + article.status = 'Published' + article.date_published = date.today() + article.save() + return HttpResponseRedirect(reverse('articles:write')) \ No newline at end of file diff --git a/charts/admin.py b/charts/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/charts/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/charts/apps.py b/charts/apps.py new file mode 100644 index 0000000..a39d4e6 --- /dev/null +++ b/charts/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class chartsConfig(AppConfig): + name = 'charts' diff --git a/monerojnet/models.py b/charts/models.py similarity index 100% rename from monerojnet/models.py rename to charts/models.py diff --git a/monerojnet/templates/monerojnet/about.html b/charts/templates/charts/about.html similarity index 82% rename from monerojnet/templates/monerojnet/about.html rename to charts/templates/charts/about.html index b38bf14..f4f2e10 100644 --- a/monerojnet/templates/monerojnet/about.html +++ b/charts/templates/charts/about.html @@ -1,4 +1,14 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - About + +{% endblock %} + {% block content %} {% load static %} @@ -22,10 +32,9 @@
-
@@ -102,26 +111,6 @@
-
-
-
-
-
-
-
- Github
-
cryptomorpheuss/moneropro -
-
-
- -
-
-
-
-
-
diff --git a/monerojnet/templates/monerojnet/articles.html b/charts/templates/charts/articles.html similarity index 85% rename from monerojnet/templates/monerojnet/articles.html rename to charts/templates/charts/articles.html index dbec342..3635ad3 100644 --- a/monerojnet/templates/monerojnet/articles.html +++ b/charts/templates/charts/articles.html @@ -30,20 +30,20 @@
@@ -288,7 +289,7 @@ data-parent="#accordionSidebar">
Charts:
- Total Subscribers + Total Subscribers
@@ -303,10 +304,10 @@ data-parent="#accordionSidebar">
Charts:
- Coincards Usage - Merchant Acceptance - Merchant Increase - Merchant Increase (%) + Coincards Usage + Merchant Acceptance + Merchant Increase + Merchant Increase (%)
@@ -345,9 +346,8 @@ data-parent="#accordionSidebar">
Info:
- About Us + About Us Twitter - CCS Proposal Link
diff --git a/monerojnet/templates/monerojnet/bitcoin.html b/charts/templates/charts/bitcoin.html similarity index 99% rename from monerojnet/templates/monerojnet/bitcoin.html rename to charts/templates/charts/bitcoin.html index a339d1c..fb90641 100644 --- a/monerojnet/templates/monerojnet/bitcoin.html +++ b/charts/templates/charts/bitcoin.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Bitcoin Comparison +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/blockchainsize.html b/charts/templates/charts/blockchainsize.html similarity index 98% rename from monerojnet/templates/monerojnet/blockchainsize.html rename to charts/templates/charts/blockchainsize.html index 233accd..dd7304b 100644 --- a/monerojnet/templates/monerojnet/blockchainsize.html +++ b/charts/templates/charts/blockchainsize.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Blockchain Size +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/blocksize.html b/charts/templates/charts/blocksize.html similarity index 98% rename from monerojnet/templates/monerojnet/blocksize.html rename to charts/templates/charts/blocksize.html index e4de3c0..b642899 100644 --- a/monerojnet/templates/monerojnet/blocksize.html +++ b/charts/templates/charts/blocksize.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Block Size +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/coincards.html b/charts/templates/charts/coincards.html similarity index 99% rename from monerojnet/templates/monerojnet/coincards.html rename to charts/templates/charts/coincards.html index 0712caf..619609c 100644 --- a/monerojnet/templates/monerojnet/coincards.html +++ b/charts/templates/charts/coincards.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Coincards Usage +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/coins.html b/charts/templates/charts/coins.html similarity index 98% rename from monerojnet/templates/monerojnet/coins.html rename to charts/templates/charts/coins.html index 17d87b5..bbb414e 100644 --- a/monerojnet/templates/monerojnet/coins.html +++ b/charts/templates/charts/coins.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Coins in Circulation +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/commit.html b/charts/templates/charts/commit.html similarity index 98% rename from monerojnet/templates/monerojnet/commit.html rename to charts/templates/charts/commit.html index dbcb070..3d7396f 100644 --- a/monerojnet/templates/monerojnet/commit.html +++ b/charts/templates/charts/commit.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Miner Commitment +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/commitntv.html b/charts/templates/charts/commitntv.html similarity index 98% rename from monerojnet/templates/monerojnet/commitntv.html rename to charts/templates/charts/commitntv.html index cf06629..9a426c4 100644 --- a/monerojnet/templates/monerojnet/commitntv.html +++ b/charts/templates/charts/commitntv.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Miner Commitment +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/competitors.html b/charts/templates/charts/competitors.html similarity index 98% rename from monerojnet/templates/monerojnet/competitors.html rename to charts/templates/charts/competitors.html index bfe0588..e71a80c 100644 --- a/monerojnet/templates/monerojnet/competitors.html +++ b/charts/templates/charts/competitors.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Competitor Performance +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/competitorslin.html b/charts/templates/charts/competitorslin.html similarity index 98% rename from monerojnet/templates/monerojnet/competitorslin.html rename to charts/templates/charts/competitorslin.html index 88777b6..81699e6 100644 --- a/monerojnet/templates/monerojnet/competitorslin.html +++ b/charts/templates/charts/competitorslin.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Competitor Performance +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/competitorssats.html b/charts/templates/charts/competitorssats.html similarity index 98% rename from monerojnet/templates/monerojnet/competitorssats.html rename to charts/templates/charts/competitorssats.html index 6878e1e..cffdb52 100644 --- a/monerojnet/templates/monerojnet/competitorssats.html +++ b/charts/templates/charts/competitorssats.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Competitor Performance +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/competitorssatslin.html b/charts/templates/charts/competitorssatslin.html similarity index 98% rename from monerojnet/templates/monerojnet/competitorssatslin.html rename to charts/templates/charts/competitorssatslin.html index 3e375df..3e19aa0 100644 --- a/monerojnet/templates/monerojnet/competitorssatslin.html +++ b/charts/templates/charts/competitorssatslin.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Competitor Performance +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/compinflation.html b/charts/templates/charts/compinflation.html similarity index 99% rename from monerojnet/templates/monerojnet/compinflation.html rename to charts/templates/charts/compinflation.html index 46769da..3ba1076 100644 --- a/monerojnet/templates/monerojnet/compinflation.html +++ b/charts/templates/charts/compinflation.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Inflation +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/dailyemission.html b/charts/templates/charts/dailyemission.html similarity index 98% rename from monerojnet/templates/monerojnet/dailyemission.html rename to charts/templates/charts/dailyemission.html index ee16893..6dc1c84 100644 --- a/monerojnet/templates/monerojnet/dailyemission.html +++ b/charts/templates/charts/dailyemission.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Daily Emission +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/dailyemissionntv.html b/charts/templates/charts/dailyemissionntv.html similarity index 98% rename from monerojnet/templates/monerojnet/dailyemissionntv.html rename to charts/templates/charts/dailyemissionntv.html index 88aff0d..d210712 100644 --- a/monerojnet/templates/monerojnet/dailyemissionntv.html +++ b/charts/templates/charts/dailyemissionntv.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Daily Emission +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/deviation.html b/charts/templates/charts/deviation.html similarity index 98% rename from monerojnet/templates/monerojnet/deviation.html rename to charts/templates/charts/deviation.html index 5163468..de48d3d 100644 --- a/monerojnet/templates/monerojnet/deviation.html +++ b/charts/templates/charts/deviation.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price Deviation +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/deviation_tx.html b/charts/templates/charts/deviation_tx.html similarity index 98% rename from monerojnet/templates/monerojnet/deviation_tx.html rename to charts/templates/charts/deviation_tx.html index 046a29c..3c5bcad 100644 --- a/monerojnet/templates/monerojnet/deviation_tx.html +++ b/charts/templates/charts/deviation_tx.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Transacted Price Deviation +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/difficulty.html b/charts/templates/charts/difficulty.html similarity index 98% rename from monerojnet/templates/monerojnet/difficulty.html rename to charts/templates/charts/difficulty.html index c286cef..36ec4cd 100644 --- a/monerojnet/templates/monerojnet/difficulty.html +++ b/charts/templates/charts/difficulty.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Mining Difficulty +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/dominance.html b/charts/templates/charts/dominance.html similarity index 98% rename from monerojnet/templates/monerojnet/dominance.html rename to charts/templates/charts/dominance.html index 5b95642..52d5dc9 100644 --- a/monerojnet/templates/monerojnet/dominance.html +++ b/charts/templates/charts/dominance.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Marketcap Dominance +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/dread_subscribers.html b/charts/templates/charts/dread_subscribers.html similarity index 98% rename from monerojnet/templates/monerojnet/dread_subscribers.html rename to charts/templates/charts/dread_subscribers.html index f66e7a1..124bed3 100644 --- a/monerojnet/templates/monerojnet/dread_subscribers.html +++ b/charts/templates/charts/dread_subscribers.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Dread Subscribers +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Dread Total Subscribes
+
Dread Subscribes
diff --git a/monerojnet/templates/monerojnet/extracoins.html b/charts/templates/charts/extracoins.html similarity index 98% rename from monerojnet/templates/monerojnet/extracoins.html rename to charts/templates/charts/extracoins.html index ebe0d13..6a39e9a 100644 --- a/monerojnet/templates/monerojnet/extracoins.html +++ b/charts/templates/charts/extracoins.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Supply Difference +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/fr.html b/charts/templates/charts/fr.html similarity index 91% rename from monerojnet/templates/monerojnet/fr.html rename to charts/templates/charts/fr.html index 077f6a4..6e83749 100644 --- a/monerojnet/templates/monerojnet/fr.html +++ b/charts/templates/charts/fr.html @@ -7,8 +7,8 @@ Moneroj.net - - + + @@ -16,6 +16,7 @@ + -
+
+ {% if user.is_authenticated %}

Saviez-vous que toutes vos données sont exposées lorsque vous utilisez Bitcoin?

Monero est ce que les gens pensent acheter lorsqu'ils investissent dans Bitcoin.

+ {% else %} + +
+
+
+

Saviez-vous que toutes vos données sont exposées lorsque vous utilisez Bitcoin?

+

Monero est ce que les gens pensent acheter lorsqu'ils investissent dans Bitcoin.

+
+ +
+
+ {% csrf_token %} + {% if form.errors %} +
+
Identifiant ou mot de passe incorrect.
 +
+ {% endif %} +
+

+

Connexion:


+ + + +

Créer un compte!

+ +
+
+
+
+
+ {% endif %}
@@ -730,9 +823,9 @@

Liens utiles

@@ -752,7 +845,6 @@
diff --git a/monerojnet/templates/monerojnet/fractal.html b/charts/templates/charts/fractal.html similarity index 98% rename from monerojnet/templates/monerojnet/fractal.html rename to charts/templates/charts/fractal.html index c1976f0..3e91295 100644 --- a/monerojnet/templates/monerojnet/fractal.html +++ b/charts/templates/charts/fractal.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Fractal Multiple +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/golden.html b/charts/templates/charts/golden.html similarity index 99% rename from monerojnet/templates/monerojnet/golden.html rename to charts/templates/charts/golden.html index ee49a2c..38791d8 100644 --- a/monerojnet/templates/monerojnet/golden.html +++ b/charts/templates/charts/golden.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Golden Ratio Multiplier +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/hashprice.html b/charts/templates/charts/hashprice.html similarity index 98% rename from monerojnet/templates/monerojnet/hashprice.html rename to charts/templates/charts/hashprice.html index 70b1199..2b3c902 100644 --- a/monerojnet/templates/monerojnet/hashprice.html +++ b/charts/templates/charts/hashprice.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price per hashrate +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/hashrate.html b/charts/templates/charts/hashrate.html similarity index 98% rename from monerojnet/templates/monerojnet/hashrate.html rename to charts/templates/charts/hashrate.html index af58fc9..a717997 100644 --- a/monerojnet/templates/monerojnet/hashrate.html +++ b/charts/templates/charts/hashrate.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Hashrate +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/hashvsprice.html b/charts/templates/charts/hashvsprice.html similarity index 98% rename from monerojnet/templates/monerojnet/hashvsprice.html rename to charts/templates/charts/hashvsprice.html index eb9787b..624ae08 100644 --- a/monerojnet/templates/monerojnet/hashvsprice.html +++ b/charts/templates/charts/hashvsprice.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price Versus Hashrate +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Price in Dollars Versus Hashrate
+
Price Versus Hashrate (Dollars)
diff --git a/monerojnet/templates/monerojnet/index.html b/charts/templates/charts/index.html similarity index 81% rename from monerojnet/templates/monerojnet/index.html rename to charts/templates/charts/index.html index 4efc5fe..3490297 100644 --- a/monerojnet/templates/monerojnet/index.html +++ b/charts/templates/charts/index.html @@ -1,12 +1,175 @@ {% extends "users/base.html" %} +{% block header %} + +Moneroj.net - Monero Metrics + + + +{% endblock header %} {% block content %}
+ {% if user.is_authenticated %}
+ + +
+
+
+
+

Crowdfunding for Moneroj.net improvements

+

Moneroj.net needs your help to pay for server expenses and further development. I'm currently developing new charts with new metrics, + and I'm happy to launch 12 new ones, along with another 10 already launched since the CCS Proposal on May 11. There's also our new Hidden Service + available for TOR users and our brand new Articles section. Read more about it.

Address: 8Agy1JvbsttEV2Jp2ecyRLSoKiCQwr4f2FKjWh2dz8Q1Y4LXCxXDNBf5praUrc1v8vDSqHYUefqxkiLNgnjvDfQNQStwvP6 +

+ +
+
+

+ Morpheus + May 11 +

+
+
+

+ Raised 0 of 46 XMR +

+
+
+
+
+
+
+
+
+
+ {% else %} + +
+
+
+
+
+
+
+

Crowdfunding for Moneroj.net - we need your donation (two months development)

+

Moneroj.net needs your help to pay for server expenses and further development. I'm currently developing new charts with new metrics, + and I'm happy to launch 12 new ones, along with another 10 already launched since the CCS Proposal on May 11. There's also our new Hidden Service + available for TOR users and our brand new Articles section. Read more about it.

Address: 8Agy1JvbsttEV2Jp2ecyRLSoKiCQwr4f2FKjWh2dz8Q1Y4LXCxXDNBf5praUrc1v8vDSqHYUefqxkiLNgnjvDfQNQStwvP6 +

+ +
+
+

+ Morpheus + May 11 +

+
+
+

+ Raised 0 of 46 XMR +

+
+
+
+
+
+
+
+
+
+
+ +
+
+ {% csrf_token %} + {% if form.errors %} +
+
Username or password incorrect.
 +
+ {% endif %} +
+

+

Login:


+ + + +

Create Account!

+ +
+
+
+
+
+ {% endif %}
@@ -360,8 +523,3 @@ {% endblock content %} - - - - - diff --git a/monerojnet/templates/monerojnet/inflation.html b/charts/templates/charts/inflation.html similarity index 98% rename from monerojnet/templates/monerojnet/inflation.html rename to charts/templates/charts/inflation.html index 92aad3c..0cd81bc 100644 --- a/monerojnet/templates/monerojnet/inflation.html +++ b/charts/templates/charts/inflation.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Annualized Inflation +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/inflationfractal.html b/charts/templates/charts/inflationfractal.html similarity index 98% rename from monerojnet/templates/monerojnet/inflationfractal.html rename to charts/templates/charts/inflationfractal.html index 40471e2..bdb7c59 100644 --- a/monerojnet/templates/monerojnet/inflationfractal.html +++ b/charts/templates/charts/inflationfractal.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Inflation-Adjusted Fractal +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/inflationreturn.html b/charts/templates/charts/inflationreturn.html similarity index 98% rename from monerojnet/templates/monerojnet/inflationreturn.html rename to charts/templates/charts/inflationreturn.html index f79d562..7952862 100644 --- a/monerojnet/templates/monerojnet/inflationreturn.html +++ b/charts/templates/charts/inflationreturn.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Return Versus Inflation +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Return vs. Inflation +
Return Versus Inflation
Moneroj.net - Monero Metrics + + + +{% endblock header %} +{% block content %} + + +
+
+

{{ message }}

+
+
+

+ + +{% endblock content %} + + diff --git a/monerojnet/templates/monerojnet/marketcap.html b/charts/templates/charts/marketcap.html similarity index 99% rename from monerojnet/templates/monerojnet/marketcap.html rename to charts/templates/charts/marketcap.html index 70b35eb..de69c7d 100644 --- a/monerojnet/templates/monerojnet/marketcap.html +++ b/charts/templates/charts/marketcap.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Marketcap +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/merchants.html b/charts/templates/charts/merchants.html similarity index 99% rename from monerojnet/templates/monerojnet/merchants.html rename to charts/templates/charts/merchants.html index cb833f8..843cdbe 100644 --- a/monerojnet/templates/monerojnet/merchants.html +++ b/charts/templates/charts/merchants.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Total Merchants +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/merchants_increase.html b/charts/templates/charts/merchants_increase.html similarity index 99% rename from monerojnet/templates/monerojnet/merchants_increase.html rename to charts/templates/charts/merchants_increase.html index 93bbff3..5c28a43 100644 --- a/monerojnet/templates/monerojnet/merchants_increase.html +++ b/charts/templates/charts/merchants_increase.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Merchants Increase +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/merchants_percentage.html b/charts/templates/charts/merchants_percentage.html similarity index 99% rename from monerojnet/templates/monerojnet/merchants_percentage.html rename to charts/templates/charts/merchants_percentage.html index 55f1476..13920ef 100644 --- a/monerojnet/templates/monerojnet/merchants_percentage.html +++ b/charts/templates/charts/merchants_percentage.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Merchants Percentage +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/metcalfesats.html b/charts/templates/charts/metcalfesats.html similarity index 98% rename from monerojnet/templates/monerojnet/metcalfesats.html rename to charts/templates/charts/metcalfesats.html index 97cb81a..b48cd61 100644 --- a/monerojnet/templates/monerojnet/metcalfesats.html +++ b/charts/templates/charts/metcalfesats.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Metcalfe's Law +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/metcalfeusd.html b/charts/templates/charts/metcalfeusd.html similarity index 98% rename from monerojnet/templates/monerojnet/metcalfeusd.html rename to charts/templates/charts/metcalfeusd.html index 84c266c..82b59b5 100644 --- a/monerojnet/templates/monerojnet/metcalfeusd.html +++ b/charts/templates/charts/metcalfeusd.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Metcalfe's Law +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/minerfees.html b/charts/templates/charts/minerfees.html similarity index 97% rename from monerojnet/templates/monerojnet/minerfees.html rename to charts/templates/charts/minerfees.html index b17acaa..72e245b 100644 --- a/monerojnet/templates/monerojnet/minerfees.html +++ b/charts/templates/charts/minerfees.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Miner Fees +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Daily Miner Fees (Fees excluded new coins, Dollars) +
Miner Fees (Fees excluded new coins, Dollars)
Moneroj.net - Miner Fees +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Daily Miner Fees (Fees excluded new coins, Native Units) +
Miner Fees (Fees excluded new coins, Native Units)
Moneroj.net - Miner Revenue +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Average Daily Miner Revenue (Dollars)
+
Average Miner Revenue (Dollars)
diff --git a/monerojnet/templates/monerojnet/minerrevcap.html b/charts/templates/charts/minerrevcap.html similarity index 98% rename from monerojnet/templates/monerojnet/minerrevcap.html rename to charts/templates/charts/minerrevcap.html index 60ad7e0..4d36d44 100644 --- a/monerojnet/templates/monerojnet/minerrevcap.html +++ b/charts/templates/charts/minerrevcap.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Miner Revenue +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/minerrevntv.html b/charts/templates/charts/minerrevntv.html similarity index 98% rename from monerojnet/templates/monerojnet/minerrevntv.html rename to charts/templates/charts/minerrevntv.html index 4ff308e..b911664 100644 --- a/monerojnet/templates/monerojnet/minerrevntv.html +++ b/charts/templates/charts/minerrevntv.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Miner Revenue +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/monerodominance.html b/charts/templates/charts/monerodominance.html similarity index 98% rename from monerojnet/templates/monerojnet/monerodominance.html rename to charts/templates/charts/monerodominance.html index e517645..d3fa6b0 100644 --- a/monerojnet/templates/monerojnet/monerodominance.html +++ b/charts/templates/charts/monerodominance.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Monero's Dominance +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/movingaverage.html b/charts/templates/charts/movingaverage.html similarity index 98% rename from monerojnet/templates/monerojnet/movingaverage.html rename to charts/templates/charts/movingaverage.html index 44e7f7d..5e9a5ae 100644 --- a/monerojnet/templates/monerojnet/movingaverage.html +++ b/charts/templates/charts/movingaverage.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Price in log scale (USD)
+
Price (log scale, USD)
diff --git a/monerojnet/templates/monerojnet/percentage.html b/charts/templates/charts/percentage.html similarity index 98% rename from monerojnet/templates/monerojnet/percentage.html rename to charts/templates/charts/percentage.html index 645425e..98f37b8 100644 --- a/monerojnet/templates/monerojnet/percentage.html +++ b/charts/templates/charts/percentage.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Transaction Percentage +{% endblock %} + {% block content %} diff --git a/charts/templates/charts/percentmonth.html b/charts/templates/charts/percentmonth.html new file mode 100644 index 0000000..3f40042 --- /dev/null +++ b/charts/templates/charts/percentmonth.html @@ -0,0 +1,327 @@ +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Monthly Percentage +{% endblock %} + +{% block content %} + + +
+ + +
+ + +

+
+
+ +
+
+
+ + + +
+ + +
+
+
+
+ Monthly Percentage
+
{{ now_transactions }}
+
+
+
+ +
+
+
+
+ Highest Percentage of Transactions
+
{{ maximum }}
+
+
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ + +
+ + +
+ + + + + + + + + + +{% endblock %} \ No newline at end of file diff --git a/monerojnet/templates/monerojnet/powerlaw.html b/charts/templates/charts/powerlaw.html similarity index 99% rename from monerojnet/templates/monerojnet/powerlaw.html rename to charts/templates/charts/powerlaw.html index d6a1e47..a155d92 100644 --- a/monerojnet/templates/monerojnet/powerlaw.html +++ b/charts/templates/charts/powerlaw.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Power Law +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/pricelin.html b/charts/templates/charts/pricelin.html similarity index 98% rename from monerojnet/templates/monerojnet/pricelin.html rename to charts/templates/charts/pricelin.html index dd2d7bc..5aeab4b 100644 --- a/monerojnet/templates/monerojnet/pricelin.html +++ b/charts/templates/charts/pricelin.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Price (USD)
+
Price (linear scale, USD)
diff --git a/monerojnet/templates/monerojnet/pricelog.html b/charts/templates/charts/pricelog.html similarity index 98% rename from monerojnet/templates/monerojnet/pricelog.html rename to charts/templates/charts/pricelog.html index 90c7dfa..be109e1 100644 --- a/monerojnet/templates/monerojnet/pricelog.html +++ b/charts/templates/charts/pricelog.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price +{% endblock %} + {% block content %} @@ -14,7 +19,7 @@
-
Price (USD)
+
Price (log scale, USD)
diff --git a/monerojnet/templates/monerojnet/pricesats.html b/charts/templates/charts/pricesats.html similarity index 98% rename from monerojnet/templates/monerojnet/pricesats.html rename to charts/templates/charts/pricesats.html index 1f6154a..0611273 100644 --- a/monerojnet/templates/monerojnet/pricesats.html +++ b/charts/templates/charts/pricesats.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Price +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/privacydominance.html b/charts/templates/charts/privacydominance.html similarity index 98% rename from monerojnet/templates/monerojnet/privacydominance.html rename to charts/templates/charts/privacydominance.html index 64555df..ab8bead 100644 --- a/monerojnet/templates/monerojnet/privacydominance.html +++ b/charts/templates/charts/privacydominance.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Privacy Dominance +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/privacymarketcap.html b/charts/templates/charts/privacymarketcap.html similarity index 98% rename from monerojnet/templates/monerojnet/privacymarketcap.html rename to charts/templates/charts/privacymarketcap.html index 472f7ad..7e57525 100644 --- a/monerojnet/templates/monerojnet/privacymarketcap.html +++ b/charts/templates/charts/privacymarketcap.html @@ -1,4 +1,9 @@ -{% extends 'monerojnet/base.html' %} +{% extends 'charts/base.html' %} + +{% block header %} +Moneroj.net - Privacy Marketcap +{% endblock %} + {% block content %} diff --git a/monerojnet/templates/monerojnet/pt.html b/charts/templates/charts/pt.html similarity index 89% rename from monerojnet/templates/monerojnet/pt.html rename to charts/templates/charts/pt.html index f44ebb1..1aea4c2 100644 --- a/monerojnet/templates/monerojnet/pt.html +++ b/charts/templates/charts/pt.html @@ -6,8 +6,8 @@ Moneroj.net - - + + @@ -23,6 +23,66 @@ .color-orange { color: #ff6b3b; } + + .login_page { + margin: 0 auto 25px; + width: 250px; + } + + .form { + position: relative; + z-index: 1; + background: #313030; + max-width: 100%; + margin: 0 auto 25px; + padding: 20px; + text-align: center; + border-radius: 20px + } + + .form input { + font-family: "Roboto", Sans-serif; + outline: 0; + width: 100%; + border: 0; + margin: 0 0 10px; + padding: 5px; + font-size: 14px; + border-radius: 5px + } + + .form button { + font-family: "Roboto", Sans-serif; + outline: 0; + background: #ff4d21; + width: 100%; + border: 0; + border-radius: 5px; + padding: 5px; + color: #ffffff; + font-size: 14px; + cursor: pointer + } + + .form button:hover, + .form button:active { + background: #db3b13 + } + + .form .message { + margin: 10px 0 0; + color: rgb(255, 255, 255); + font-size: 16px + } + + .form .message a { + color: #ff4d21; + text-decoration: none + } + + .form .register_form { + display: none + } @@ -30,20 +90,20 @@