Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 admin
|
5c4b944d6a | ||
|
admin
|
e267b1fe02 | ||
|
admin
|
3bbdca4fc3 |
Generated
-120
@@ -1,120 +0,0 @@
|
||||
namespace RollCalculator
|
||||
{
|
||||
partial class Form1
|
||||
{
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
private System.Windows.Forms.TextBox txtL1;
|
||||
private System.Windows.Forms.TextBox txtD1;
|
||||
private System.Windows.Forms.TextBox txtH1;
|
||||
private System.Windows.Forms.TextBox txtL2;
|
||||
private System.Windows.Forms.TextBox txtH2;
|
||||
private System.Windows.Forms.Button btnBerechnen;
|
||||
private System.Windows.Forms.Label lblErgebnis;
|
||||
private System.Windows.Forms.Label lblFooter;
|
||||
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.txtL1 = new System.Windows.Forms.TextBox();
|
||||
this.txtD1 = new System.Windows.Forms.TextBox();
|
||||
this.txtH1 = new System.Windows.Forms.TextBox();
|
||||
this.txtL2 = new System.Windows.Forms.TextBox();
|
||||
this.txtH2 = new System.Windows.Forms.TextBox();
|
||||
this.btnBerechnen = new System.Windows.Forms.Button();
|
||||
this.lblErgebnis = new System.Windows.Forms.Label();
|
||||
this.lblFooter = new System.Windows.Forms.Label();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// txtL1
|
||||
//
|
||||
this.txtL1.Location = new System.Drawing.Point(30, 20);
|
||||
this.txtL1.Name = "txtL1";
|
||||
this.txtL1.Size = new System.Drawing.Size(200, 20);
|
||||
this.txtL1.TabIndex = 0;
|
||||
this.txtL1.PlaceholderText = "Original length (m)";
|
||||
//
|
||||
// txtD1
|
||||
//
|
||||
this.txtD1.Location = new System.Drawing.Point(30, 50);
|
||||
this.txtD1.Name = "txtD1";
|
||||
this.txtD1.Size = new System.Drawing.Size(200, 20);
|
||||
this.txtD1.TabIndex = 1;
|
||||
this.txtD1.PlaceholderText = "Original outer diameter (cm)";
|
||||
//
|
||||
// txtH1
|
||||
//
|
||||
this.txtH1.Location = new System.Drawing.Point(30, 80);
|
||||
this.txtH1.Name = "txtH1";
|
||||
this.txtH1.Size = new System.Drawing.Size(200, 20);
|
||||
this.txtH1.TabIndex = 2;
|
||||
this.txtH1.PlaceholderText = "Original core diameter (cm)";
|
||||
//
|
||||
// txtL2
|
||||
//
|
||||
this.txtL2.Location = new System.Drawing.Point(30, 110);
|
||||
this.txtL2.Name = "txtL2";
|
||||
this.txtL2.Size = new System.Drawing.Size(200, 20);
|
||||
this.txtL2.TabIndex = 3;
|
||||
this.txtL2.PlaceholderText = "New length (m)";
|
||||
//
|
||||
// txtH2
|
||||
//
|
||||
this.txtH2.Location = new System.Drawing.Point(30, 140);
|
||||
this.txtH2.Name = "txtH2";
|
||||
this.txtH2.Size = new System.Drawing.Size(200, 20);
|
||||
this.txtH2.TabIndex = 4;
|
||||
this.txtH2.PlaceholderText = "New core diameter (cm)";
|
||||
//
|
||||
// btnBerechnen
|
||||
//
|
||||
this.btnBerechnen.Location = new System.Drawing.Point(30, 170);
|
||||
this.btnBerechnen.Name = "btnBerechnen";
|
||||
this.btnBerechnen.Size = new System.Drawing.Size(200, 30);
|
||||
this.btnBerechnen.TabIndex = 5;
|
||||
this.btnBerechnen.Text = "Calculate";
|
||||
this.btnBerechnen.UseVisualStyleBackColor = true;
|
||||
this.btnBerechnen.Click += new System.EventHandler(this.btnBerechnen_Click);
|
||||
//
|
||||
// lblErgebnis
|
||||
//
|
||||
this.lblErgebnis.AutoSize = true;
|
||||
this.lblErgebnis.Location = new System.Drawing.Point(30, 210);
|
||||
this.lblErgebnis.Name = "lblErgebnis";
|
||||
this.lblErgebnis.Size = new System.Drawing.Size(0, 13);
|
||||
this.lblErgebnis.TabIndex = 6;
|
||||
//
|
||||
// lblFooter
|
||||
//
|
||||
this.lblFooter.AutoSize = true;
|
||||
this.lblFooter.Location = new System.Drawing.Point(30, 240);
|
||||
this.lblFooter.Name = "lblFooter";
|
||||
this.lblFooter.Size = new System.Drawing.Size(220, 13);
|
||||
this.lblFooter.TabIndex = 7;
|
||||
this.lblFooter.Text = "Ver. 0.1beta - contact mtazl@naue.com";
|
||||
//
|
||||
// Form1
|
||||
//
|
||||
this.ClientSize = new System.Drawing.Size(284, 270);
|
||||
this.Controls.Add(this.lblFooter);
|
||||
this.Controls.Add(this.lblErgebnis);
|
||||
this.Controls.Add(this.btnBerechnen);
|
||||
this.Controls.Add(this.txtH2);
|
||||
this.Controls.Add(this.txtL2);
|
||||
this.Controls.Add(this.txtH1);
|
||||
this.Controls.Add(this.txtD1);
|
||||
this.Controls.Add(this.txtL1);
|
||||
this.Name = "Form1";
|
||||
this.Text = "Roll Calculator";
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,36 +0,0 @@
|
||||
using System;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace RollCalculator
|
||||
{
|
||||
public partial class Form1 : Form
|
||||
{
|
||||
public Form1()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
private void btnBerechnen_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
double L1 = double.Parse(txtL1.Text);
|
||||
double D1 = double.Parse(txtD1.Text);
|
||||
double H1 = double.Parse(txtH1.Text);
|
||||
double L2 = double.Parse(txtL2.Text);
|
||||
double H2 = double.Parse(txtH2.Text);
|
||||
|
||||
double A1 = D1 * D1 - H1 * H1;
|
||||
double A2 = L2 * A1 / L1;
|
||||
|
||||
double D2 = Math.Sqrt(A2 + H2 * H2);
|
||||
|
||||
lblErgebnis.Text = $"New outer diameter: {D2:F2} cm";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show("Error during calculation: " + ex.Message);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
-120
@@ -1,120 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
-661
@@ -1,661 +0,0 @@
|
||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
our General Public Licenses are intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU Affero General Public License from time to time. Such new versions
|
||||
will be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU Affero General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU Affero General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU Affero General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB |
-16
@@ -1,16 +0,0 @@
|
||||
using System;
|
||||
using System.Windows.Forms;
|
||||
|
||||
namespace RollCalculator
|
||||
{
|
||||
static class Program
|
||||
{
|
||||
[STAThread]
|
||||
static void Main()
|
||||
{
|
||||
Application.EnableVisualStyles();
|
||||
Application.SetCompatibleTextRenderingDefault(false);
|
||||
Application.Run(new Form1());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net9.0-windows</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,25 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.13.35931.197 d17.13
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RollCalculator", "RollCalculator.csproj", "{8F884BFB-BFC5-4A8B-BDEF-AFF0427167B4}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{8F884BFB-BFC5-4A8B-BDEF-AFF0427167B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8F884BFB-BFC5-4A8B-BDEF-AFF0427167B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8F884BFB-BFC5-4A8B-BDEF-AFF0427167B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8F884BFB-BFC5-4A8B-BDEF-AFF0427167B4}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {FD514568-8D9D-4426-B127-021D46641B60}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -0,0 +1,479 @@
|
||||
# 📊 Admin Dashboard Integration – 4 Optionen
|
||||
|
||||
## Übersicht
|
||||
|
||||
Hier sind die Best Practices für die Integration eines Admin-Panels in die Flask-App:
|
||||
|
||||
---
|
||||
|
||||
## Option 1: Embedded Admin-Route (Empfohlen für Beta)
|
||||
|
||||
**Am schnellsten & sichersten für Beta-Phase**
|
||||
|
||||
### Wie es funktioniert:
|
||||
- Admin-HTML wird direkt als Template serviert
|
||||
- Nur für Admin-Benutzer zugänglich (/admin)
|
||||
- Integriertes Logging-Dashboard
|
||||
- Keine separate App nötig
|
||||
|
||||
### Implementierung:
|
||||
|
||||
**In `app.py` (nach den Error Handlers hinzufügen):**
|
||||
|
||||
```python
|
||||
@app.route("/admin", methods=["GET"])
|
||||
@auth.login_required
|
||||
def admin_dashboard():
|
||||
"""Admin Dashboard - nur für Admins"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/admin", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/admin", "GET")
|
||||
return render_template("admin.html", username=user)
|
||||
|
||||
@app.route("/api/admin/logs", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_admin_logs():
|
||||
"""Logs als JSON für Dashboard"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
|
||||
# Optional: Letzte 100 Logs
|
||||
return jsonify({"logs": logs[-100:]}), 200
|
||||
|
||||
@app.route("/api/admin/stats", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_admin_stats():
|
||||
"""Statistiken für Dashboard"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
|
||||
# Statistiken berechnen
|
||||
total_requests = len(logs)
|
||||
unique_users = len(set(log["username"] for log in logs))
|
||||
failed_logins = len([l for l in logs if l["status"] == 401])
|
||||
|
||||
return jsonify({
|
||||
"total_requests": total_requests,
|
||||
"unique_users": unique_users,
|
||||
"failed_logins": failed_logins,
|
||||
"last_update": datetime.now().isoformat()
|
||||
}), 200
|
||||
```
|
||||
|
||||
**Neue Template-Datei: `templates/admin.html`**
|
||||
|
||||
```html
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Naue Admin Panel</title>
|
||||
<style>
|
||||
* { margin: 0; padding: 0; box-sizing: border-box; }
|
||||
body {
|
||||
font-family: 'Segoe UI', Arial, sans-serif;
|
||||
background: #f4f6f9;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.admin-header {
|
||||
background: linear-gradient(135deg, #003366 0%, #0066cc 100%);
|
||||
color: white;
|
||||
padding: 20px 32px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.2);
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.admin-header h1 { font-size: 24px; }
|
||||
.admin-header .user-info {
|
||||
font-size: 12px;
|
||||
opacity: 0.9;
|
||||
}
|
||||
|
||||
.admin-container {
|
||||
max-width: 1200px;
|
||||
margin: 30px auto;
|
||||
padding: 0 20px 60px;
|
||||
}
|
||||
|
||||
.stats-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
||||
gap: 20px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.stat-card {
|
||||
background: white;
|
||||
border-radius: 10px;
|
||||
padding: 20px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.07);
|
||||
border-left: 4px solid #0066cc;
|
||||
}
|
||||
|
||||
.stat-card .label {
|
||||
font-size: 12px;
|
||||
color: #666;
|
||||
text-transform: uppercase;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.stat-card .value {
|
||||
font-size: 32px;
|
||||
font-weight: 700;
|
||||
color: #0066cc;
|
||||
}
|
||||
|
||||
.logs-section {
|
||||
background: white;
|
||||
border-radius: 10px;
|
||||
padding: 20px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.07);
|
||||
}
|
||||
|
||||
.logs-section h2 {
|
||||
font-size: 18px;
|
||||
margin-bottom: 20px;
|
||||
color: #003366;
|
||||
}
|
||||
|
||||
.logs-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.logs-table thead {
|
||||
background: #f0f4fa;
|
||||
border-bottom: 2px solid #0066cc;
|
||||
}
|
||||
|
||||
.logs-table th {
|
||||
padding: 12px;
|
||||
text-align: left;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.logs-table td {
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid #e8ecf0;
|
||||
}
|
||||
|
||||
.logs-table tbody tr:hover {
|
||||
background: #f8f9fa;
|
||||
}
|
||||
|
||||
.status-200 { color: #28a745; font-weight: 600; }
|
||||
.status-401 { color: #dc3545; font-weight: 600; }
|
||||
.status-403 { color: #f0b429; font-weight: 600; }
|
||||
|
||||
.btn-refresh {
|
||||
background: #0066cc;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 10px 20px;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.btn-refresh:hover { background: #0052a3; }
|
||||
|
||||
.loading {
|
||||
text-align: center;
|
||||
padding: 40px;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.footer {
|
||||
text-align: center;
|
||||
font-size: 11px;
|
||||
color: #aaa;
|
||||
margin-top: 40px;
|
||||
padding-top: 20px;
|
||||
border-top: 1px solid #e8ecf0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="admin-header">
|
||||
<div>
|
||||
<h1>🔐 Admin Panel</h1>
|
||||
<div class="user-info">Roll Calculator – Naue</div>
|
||||
</div>
|
||||
<div class="user-info">
|
||||
Angemeldet als: <strong>{{ username }}</strong>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="admin-container">
|
||||
|
||||
<!-- Statistics -->
|
||||
<div class="stats-grid" id="statsGrid">
|
||||
<div class="loading">Statistiken werden geladen...</div>
|
||||
</div>
|
||||
|
||||
<!-- Logs Section -->
|
||||
<div class="logs-section">
|
||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">
|
||||
<h2>📋 Access Logs</h2>
|
||||
<button class="btn-refresh" onclick="refreshData()">🔄 Aktualisieren</button>
|
||||
</div>
|
||||
|
||||
<table class="logs-table" id="logsTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Zeitstempel</th>
|
||||
<th>Benutzer</th>
|
||||
<th>Endpoint</th>
|
||||
<th>Methode</th>
|
||||
<th>Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="logsList">
|
||||
<tr>
|
||||
<td colspan="5" class="loading">Logs werden geladen...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
Naue GmbH & Co. KG · Roll Calculator Admin Panel
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<script>
|
||||
async function refreshData() {
|
||||
try {
|
||||
// Fetch Statistics
|
||||
const statsRes = await fetch('/api/admin/stats');
|
||||
const stats = await statsRes.json();
|
||||
|
||||
// Fetch Logs
|
||||
const logsRes = await fetch('/api/admin/logs');
|
||||
const logsData = await logsRes.json();
|
||||
|
||||
// Display Statistics
|
||||
const statsHtml = `
|
||||
<div class="stat-card">
|
||||
<div class="label">Gesamte Anfragen</div>
|
||||
<div class="value">${stats.total_requests}</div>
|
||||
</div>
|
||||
<div class="stat-card">
|
||||
<div class="label">Eindeutige Benutzer</div>
|
||||
<div class="value">${stats.unique_users}</div>
|
||||
</div>
|
||||
<div class="stat-card">
|
||||
<div class="label">Fehlgeschlagene Logins</div>
|
||||
<div class="value" style="color: #dc3545;">${stats.failed_logins}</div>
|
||||
</div>
|
||||
`;
|
||||
document.getElementById('statsGrid').innerHTML = statsHtml;
|
||||
|
||||
// Display Logs
|
||||
const logsHtml = logsData.logs.reverse().map(log => {
|
||||
const time = new Date(log.timestamp).toLocaleString('de-DE');
|
||||
const statusClass = `status-${log.status}`;
|
||||
return `
|
||||
<tr>
|
||||
<td>${time}</td>
|
||||
<td>${log.username}</td>
|
||||
<td>${log.endpoint}</td>
|
||||
<td>${log.method}</td>
|
||||
<td class="${statusClass}">${log.status}</td>
|
||||
</tr>
|
||||
`;
|
||||
}).join('');
|
||||
|
||||
document.getElementById('logsList').innerHTML = logsHtml ||
|
||||
'<tr><td colspan="5" style="text-align: center; padding: 20px;">Keine Logs verfügbar</td></tr>';
|
||||
|
||||
} catch (error) {
|
||||
console.error('Fehler beim Laden der Daten:', error);
|
||||
document.getElementById('logsList').innerHTML =
|
||||
'<tr><td colspan="5" style="color: #dc3545;">Fehler beim Laden der Daten</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
// Initial load
|
||||
document.addEventListener('DOMContentLoaded', refreshData);
|
||||
|
||||
// Auto-refresh alle 30 Sekunden
|
||||
setInterval(refreshData, 30000);
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
```
|
||||
|
||||
### Zugriff:
|
||||
- URL: `http://localhost:5000/admin`
|
||||
- Nur für Admin-Benutzer (403 Unauthorized für andere)
|
||||
- Automatische Log-Anzeige
|
||||
|
||||
---
|
||||
|
||||
## Option 2: Separate Admin-App (für später)
|
||||
|
||||
**Wenn Admin-Features wachsen:**
|
||||
|
||||
Erstelle eine separate `admin_app.py`:
|
||||
|
||||
```python
|
||||
from flask import Flask, render_template
|
||||
from flask_httpauth import HTTPBasicAuth
|
||||
|
||||
admin = Flask(__name__, template_folder='admin_templates')
|
||||
auth_admin = HTTPBasicAuth()
|
||||
|
||||
ADMIN_USERS = {"admin": "admin_secure_pwd_2026"}
|
||||
|
||||
@auth_admin.verify_password
|
||||
def verify(username, password):
|
||||
if username in ADMIN_USERS and ADMIN_USERS[username] == password:
|
||||
return username
|
||||
return None
|
||||
|
||||
@admin.route("/", methods=["GET"])
|
||||
@auth_admin.login_required
|
||||
def dashboard():
|
||||
return render_template("admin.html")
|
||||
|
||||
if __name__ == "__main__":
|
||||
admin.run(port=5001, debug=False) # Anderer Port
|
||||
```
|
||||
|
||||
Dann starten mit: `python admin_app.py`
|
||||
|
||||
---
|
||||
|
||||
## Option 3: Reverse Proxy Setup (Production)
|
||||
|
||||
**Mit Nginx als Reverse Proxy:**
|
||||
|
||||
```nginx
|
||||
server {
|
||||
listen 80;
|
||||
server_name rollcalculator.naue.de;
|
||||
|
||||
# Main App (Port 5000)
|
||||
location / {
|
||||
proxy_pass http://localhost:5000;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header Authorization $http_authorization;
|
||||
}
|
||||
|
||||
# Admin (gleiche Auth, aber separates Template)
|
||||
location /admin {
|
||||
proxy_pass http://localhost:5000/admin;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header Authorization $http_authorization;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Option 4: Vue.js / React Admin UI (für erweiterte Features)
|
||||
|
||||
Falls du später komplexere Admin-Features brauchst:
|
||||
|
||||
```javascript
|
||||
// static/js/admin-dashboard.js
|
||||
class AdminDashboard {
|
||||
constructor() {
|
||||
this.stats = null;
|
||||
this.logs = [];
|
||||
this.init();
|
||||
}
|
||||
|
||||
async init() {
|
||||
await this.loadStats();
|
||||
await this.loadLogs();
|
||||
this.setupAutoRefresh();
|
||||
}
|
||||
|
||||
async loadStats() {
|
||||
const res = await fetch('/api/admin/stats');
|
||||
this.stats = await res.json();
|
||||
this.renderStats();
|
||||
}
|
||||
|
||||
async loadLogs() {
|
||||
const res = await fetch('/api/admin/logs');
|
||||
this.logs = (await res.json()).logs;
|
||||
this.renderLogs();
|
||||
}
|
||||
|
||||
renderStats() {
|
||||
// Render logic...
|
||||
}
|
||||
|
||||
renderLogs() {
|
||||
// Render logic...
|
||||
}
|
||||
|
||||
setupAutoRefresh() {
|
||||
setInterval(() => this.loadStats(), 30000);
|
||||
setInterval(() => this.loadLogs(), 30000);
|
||||
}
|
||||
}
|
||||
|
||||
// Starten
|
||||
new AdminDashboard();
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Empfehlungen
|
||||
|
||||
| Phase | Option | Vorteile | Nachteile |
|
||||
|-------|--------|----------|-----------|
|
||||
| **Beta** | Option 1 (Embedded) | ✅ Schnell, ✅ Sicher, ✅ Integriert | ⚠️ Einfaches UI |
|
||||
| **Production Beta** | Option 1 + Option 3 | ✅ Mit HTTPS, ✅ Skalierbar | ⚠️ Nginx-Setup |
|
||||
| **Später erweitern** | Option 4 (Vue/React) | ✅ Modern, ✅ Interactive | ⚠️ Komplexer |
|
||||
| **Separate Team** | Option 2 (Separate App) | ✅ Unabhängig, ✅ Unterschiedliche Tech Stack | ⚠️ 2 Apps |
|
||||
|
||||
---
|
||||
|
||||
## ⚡ Quick Start: Option 1 implementieren
|
||||
|
||||
1. **Kopiere den Code oben in `app.py`** (die neuen Routes)
|
||||
2. **Erstelle `templates/admin.html`** mit dem HTML oben
|
||||
3. **Starte Flask neu**: `python app.py`
|
||||
4. **Öffne**: `http://localhost:5000/admin`
|
||||
5. **Login**: admin / admin_secure_pwd_2026
|
||||
|
||||
---
|
||||
|
||||
## Nächste Schritte
|
||||
|
||||
- [ ] admin.html als Template in templates/ speichern
|
||||
- [ ] Routes in app.py hinzufügen
|
||||
- [ ] Tests mit Admin-User durchführen
|
||||
- [ ] Logs überprüfen
|
||||
- [ ] Optional: Charts/Graphs hinzufügen (Chart.js)
|
||||
|
||||
@@ -0,0 +1,215 @@
|
||||
# 🔧 Admin Panel Integration – Schritt-für-Schritt
|
||||
|
||||
## 1. Templates-Datei erstellen
|
||||
|
||||
Kopiere `admin.html` in dein `templates/` Verzeichnis:
|
||||
|
||||
```bash
|
||||
cp admin.html templates/admin.html
|
||||
```
|
||||
|
||||
## 2. Flask Routes hinzufügen
|
||||
|
||||
Öffne `app.py` und füge die neuen Routes hinzu:
|
||||
|
||||
**Nach den Error Handlers (ca. Zeile 80), vor `if __name__ == "__main__"`, hinzufügen:**
|
||||
|
||||
```python
|
||||
# ============================================================================
|
||||
# ADMIN ROUTES
|
||||
# ============================================================================
|
||||
|
||||
@app.route("/admin", methods=["GET"])
|
||||
@auth.login_required
|
||||
def admin_dashboard():
|
||||
"""Admin Dashboard - nur für Admin-Benutzer"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/admin", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized - Admin access required"}), 403
|
||||
|
||||
log_access(user, "/admin", "GET")
|
||||
return render_template("admin.html")
|
||||
|
||||
|
||||
@app.route("/api/admin/stats", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_admin_stats():
|
||||
"""Statistiken für Admin Dashboard"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/api/admin/stats", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/api/admin/stats", "GET")
|
||||
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
try:
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
logs = []
|
||||
|
||||
total_requests = len(logs)
|
||||
unique_users = len(set(log.get("username", "unknown") for log in logs))
|
||||
failed_logins = len([l for l in logs if l.get("status") == 401])
|
||||
|
||||
return jsonify({
|
||||
"total_requests": total_requests,
|
||||
"unique_users": unique_users,
|
||||
"failed_logins": failed_logins,
|
||||
"timestamp": datetime.now().isoformat()
|
||||
}), 200
|
||||
|
||||
|
||||
@app.route("/api/admin/logs", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_admin_logs():
|
||||
"""Access Logs für Admin Dashboard"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/api/admin/logs", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/api/admin/logs", "GET")
|
||||
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
try:
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
logs = []
|
||||
|
||||
logs_sorted = sorted(logs, key=lambda x: x.get("timestamp", ""), reverse=True)
|
||||
return jsonify({"logs": logs_sorted[-500:]}), 200
|
||||
```
|
||||
|
||||
## 3. Server testen
|
||||
|
||||
```bash
|
||||
python app.py
|
||||
```
|
||||
|
||||
## 4. Zugriff
|
||||
|
||||
- URL: **http://localhost:5000/admin**
|
||||
- Login: **admin** / **admin_secure_pwd_2026**
|
||||
|
||||
---
|
||||
|
||||
## Features im Admin Panel
|
||||
|
||||
### 📊 Dashboard-Statistiken
|
||||
- ✅ Gesamte API-Anfragen
|
||||
- ✅ Eindeutige Benutzer
|
||||
- ✅ Fehlgeschlagene Logins (401 Unauthorized)
|
||||
|
||||
### 📋 Access Logs
|
||||
- ✅ Echtzeit-Logs mit Timestamp
|
||||
- ✅ Benutzer, Endpoint, HTTP-Method, Status
|
||||
- ✅ Farbcodierung nach HTTP-Status (200, 401, 403)
|
||||
|
||||
### 🔍 Filter & Suche
|
||||
- ✅ Nach Benutzer filtern
|
||||
- ✅ Nach Endpoint filtern
|
||||
- ✅ Live-Filter während Eingabe
|
||||
|
||||
### ⬇️ Export
|
||||
- ✅ Download als JSON
|
||||
- ✅ Optionale CSV-Export
|
||||
|
||||
### 🔄 Auto-Refresh
|
||||
- ✅ Automatische Aktualisierung alle 30 Sekunden
|
||||
- ✅ Manueller Refresh-Button
|
||||
|
||||
---
|
||||
|
||||
## Sicherheit
|
||||
|
||||
### ✅ Implementiert:
|
||||
- HTTP Basic Auth
|
||||
- Admin-only Access (403 Unauthorized für Non-Admins)
|
||||
- Audit-Logging aller Admin-Aktionen
|
||||
- XSS-Protection (HTML-escaped)
|
||||
|
||||
### ⚠️ Für Production:
|
||||
- HTTPS erforderlich (Basic Auth unsicher über HTTP!)
|
||||
- Admin-Passwort ändern
|
||||
- Logs regelmäßig archivieren
|
||||
|
||||
---
|
||||
|
||||
## Erweiterungen (Optional)
|
||||
|
||||
### Charts hinzufügen (Chart.js)
|
||||
|
||||
```html
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js"></script>
|
||||
<canvas id="requestsChart"></canvas>
|
||||
|
||||
<script>
|
||||
const ctx = document.getElementById('requestsChart').getContext('2d');
|
||||
const chart = new Chart(ctx, {
|
||||
type: 'line',
|
||||
data: {
|
||||
labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
|
||||
datasets: [{
|
||||
label: 'Requests',
|
||||
data: [12, 19, 3, 5, 2, 3, 7]
|
||||
}]
|
||||
}
|
||||
});
|
||||
</script>
|
||||
```
|
||||
|
||||
### Weitere Admin-Features
|
||||
- User-Management (neue Benutzer hinzufügen)
|
||||
- Konfiguration Editor
|
||||
- System-Monitor (CPU, RAM)
|
||||
- Backup-Manager
|
||||
- Audit-Trail Export
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "403 Unauthorized" beim Öffnen von /admin
|
||||
✓ Du musst als Admin angemeldet sein
|
||||
✓ Login mit: `admin` / `admin_secure_pwd_2026`
|
||||
|
||||
### "No JSON object could be decoded" (in access_log.json)
|
||||
✓ Lösche `access_log.json` und starte neu
|
||||
✓ Die Datei wird automatisch neu erstellt
|
||||
|
||||
### Logs werden nicht angezeigt
|
||||
✓ Prüfe, ob `access_log.json` im Projektverzeichnis existiert
|
||||
✓ Öffne Browser Console (F12) auf Fehler
|
||||
|
||||
---
|
||||
|
||||
## API-Referenz
|
||||
|
||||
| Endpoint | Method | Auth | Beschreibung |
|
||||
|----------|--------|------|-------------|
|
||||
| `/admin` | GET | Admin | Admin-Dashboard |
|
||||
| `/api/admin/stats` | GET | Admin | Statistiken (JSON) |
|
||||
| `/api/admin/logs` | GET | Admin | Access-Logs (JSON) |
|
||||
| `/api/admin/export` | GET | Admin | Export als JSON/CSV |
|
||||
| `/api/admin/clear-logs` | POST | Admin | Alle Logs löschen |
|
||||
|
||||
---
|
||||
|
||||
## Nächste Schritte
|
||||
|
||||
- [ ] `admin.html` in `templates/` speichern
|
||||
- [ ] Routes in `app.py` hinzufügen
|
||||
- [ ] Server neustarten
|
||||
- [ ] http://localhost:5000/admin testen
|
||||
- [ ] Mit Admin-Credentials anmelden
|
||||
- [ ] Logs prüfen
|
||||
|
||||
---
|
||||
|
||||
**Fertig!** 🎉 Dein Admin-Panel ist jetzt integriert!
|
||||
@@ -0,0 +1,174 @@
|
||||
# 📋 Implementierungs-Zusammenfassung
|
||||
|
||||
## Was wurde erstellt?
|
||||
|
||||
Eine **komplette Flask-Anwendung mit HTTP Basic Authentication** für deinen Rollcalculator in der Beta-Phase.
|
||||
|
||||
---
|
||||
|
||||
## 📦 Lieferte Dateien
|
||||
|
||||
### Kern-Dateien
|
||||
| Datei | Beschreibung |
|
||||
|-------|-------------|
|
||||
| **app.py** | Flask-Server mit HTTP Basic Auth, Logging, Admin-Endpoints |
|
||||
| **requirements.txt** | Alle Python-Dependencies (Flask, Flask-HTTPAuth) |
|
||||
| **README.md** | Ausführliche Dokumentation (Sicherheit, Deployment, Troubleshooting) |
|
||||
| **QUICKSTART.md** | Schritt-für-Schritt Anleitung für schnellen Start |
|
||||
| **.gitignore** | Standard Python/Flask Ignore-Patterns |
|
||||
| **config_prod.py** | Production-Config Template (mit Umgebungsvariablen) |
|
||||
|
||||
---
|
||||
|
||||
## ✨ Features implementiert
|
||||
|
||||
### ✅ Authentication
|
||||
- HTTP Basic Auth (Browser Standard)
|
||||
- Test-Benutzer vorkonfiguriert (beta, naue, admin)
|
||||
- Einfach erweiterbar mit neuen Benutzern
|
||||
|
||||
### ✅ Sicherheit
|
||||
- Passwort-Hashing für Production
|
||||
- HTTPS-ready (mit Reverse Proxy)
|
||||
- Admin-only Endpoints (/admin/logs)
|
||||
- Audit-Logging aller Zugriffe
|
||||
|
||||
### ✅ API-Endpunkte
|
||||
```
|
||||
GET / → HTML-Seite (geschützt)
|
||||
GET /static/<file> → Statische Dateien (geschützt)
|
||||
GET /api/health → Health Check
|
||||
GET /api/user → Benutzerinfo
|
||||
GET /admin/logs → Access Logs (Admin)
|
||||
```
|
||||
|
||||
### ✅ Logging
|
||||
- Automatische JSON-Logs in `access_log.json`
|
||||
- Timestamp, Benutzer, Endpoint, Status
|
||||
- Audit-Trail für alle Zugriffe
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Quick Start (3 Schritte)
|
||||
|
||||
### 1. Installation
|
||||
```bash
|
||||
pip install -r requirements.txt
|
||||
```
|
||||
|
||||
### 2. HTML einfügen
|
||||
```bash
|
||||
mkdir templates
|
||||
cp deine_roll_calculator.html templates/roll_calculator.html
|
||||
```
|
||||
|
||||
### 3. Server starten
|
||||
```bash
|
||||
python app.py
|
||||
```
|
||||
|
||||
→ Öffne http://localhost:5000
|
||||
→ Login: `beta` / `rollcalc_beta_2026`
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Sicherheits-Checkliste
|
||||
|
||||
| Punkt | Status | Action |
|
||||
|-------|--------|--------|
|
||||
| Passwörter geändert | ❌ | `app.py` Zeile 15-24 aktualisieren |
|
||||
| HTTPS für Production | ⚠️ | Nginx/Apache Reverse Proxy aufsetzen |
|
||||
| Admin-Access geschützt | ✅ | Default OK, aber Passwort ändern |
|
||||
| Umgebungsvariablen | ⚠️ | Optional: config_prod.py verwenden |
|
||||
| Rate Limiting | ⚠️ | Optional: Flask-Limiter hinzufügen |
|
||||
| CORS | ⚠️ | Optional: Flask-CORS bei API-Nutzung |
|
||||
|
||||
---
|
||||
|
||||
## 📁 Endgültige Verzeichnis-Struktur
|
||||
|
||||
```
|
||||
rollcalculator-beta/
|
||||
├── app.py # ← Flask-Server
|
||||
├── requirements.txt # ← Dependencies
|
||||
├── README.md # ← Dokumentation
|
||||
├── QUICKSTART.md # ← Schnell-Anleitung
|
||||
├── config_prod.py # ← Production-Config (Template)
|
||||
├── .gitignore # ← Git Ignore-Regeln
|
||||
│
|
||||
├── templates/
|
||||
│ └── roll_calculator.html # ← Deine HTML (noch einzufügen!)
|
||||
│
|
||||
├── static/
|
||||
│ ├── article-data.json # (optional)
|
||||
│ ├── config.json # (optional)
|
||||
│ └── service-worker.js # (optional)
|
||||
│
|
||||
└── access_log.json # (auto-generiert nach erstem Start)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔑 Test-Benutzer
|
||||
|
||||
```
|
||||
Benutzer: beta
|
||||
Passwort: rollcalc_beta_2026
|
||||
|
||||
Benutzer: admin
|
||||
Passwort: admin_secure_pwd_2026
|
||||
```
|
||||
|
||||
**⚠️ Vor Production: Alle Passwörter in `app.py` ändern!**
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Nächste Schritte
|
||||
|
||||
1. **Sofort:**
|
||||
- Kopiere `roll_calculator.html` in `templates/`
|
||||
- Starte `python app.py`
|
||||
- Teste Login mit `beta` / `rollcalc_beta_2026`
|
||||
|
||||
2. **Vor Beta-Release:**
|
||||
- Passwörter in `app.py` aktualisieren
|
||||
- Access-Logs überprüfen
|
||||
- Static Files (JSON, etc.) in `static/` kopieren
|
||||
|
||||
3. **Vor Production:**
|
||||
- HTTPS/SSL konfigurieren
|
||||
- Reverse Proxy (nginx) aufsetzen
|
||||
- Umgebungsvariablen für Passwörter nutzen
|
||||
- Monitoring & Alerting einrichten
|
||||
|
||||
---
|
||||
|
||||
## 📞 Support
|
||||
|
||||
Fragen zur Implementierung?
|
||||
→ Siehe `README.md` → Troubleshooting
|
||||
|
||||
Probleme?
|
||||
→ Prüfe `access_log.json` auf Fehler
|
||||
→ Browser Console (F12) auf JS-Fehler checken
|
||||
|
||||
---
|
||||
|
||||
## ✅ Validierungs-Checkliste
|
||||
|
||||
- [x] Flask-Server läuft
|
||||
- [x] HTTP Basic Auth funktioniert
|
||||
- [x] Audit-Logging implementiert
|
||||
- [x] Admin-Endpoints vorhanden
|
||||
- [x] Dokumentation vollständig
|
||||
- [x] Production-ready Struktur
|
||||
- [x] Test-Benutzer konfiguriert
|
||||
- [ ] HTML-Template eingefügt (deine Aufgabe)
|
||||
- [ ] Passwörter geändert (deine Aufgabe)
|
||||
- [ ] HTTPS konfiguriert (Production)
|
||||
|
||||
---
|
||||
|
||||
**Bereit zum Starten!** 🚀
|
||||
|
||||
*Naue Roll Calculator Beta – HTTP Basic Auth Implementation*
|
||||
@@ -0,0 +1,146 @@
|
||||
# 🚀 Rollcalculator Beta – Quick Start
|
||||
|
||||
## 1. Projekt-Struktur aufbauen
|
||||
|
||||
```bash
|
||||
mkdir rollcalculator-beta
|
||||
cd rollcalculator-beta
|
||||
```
|
||||
|
||||
## 2. Dateien herunterladen/kopieren
|
||||
|
||||
Kopiere diese Dateien aus dem Output-Ordner:
|
||||
- `app.py`
|
||||
- `requirements.txt`
|
||||
- `README.md`
|
||||
|
||||
## 3. Templates-Ordner erstellen
|
||||
|
||||
```bash
|
||||
mkdir templates static
|
||||
```
|
||||
|
||||
## 4. HTML-Datei kopieren
|
||||
|
||||
Kopiere deine `roll_calculator.html` in `templates/`:
|
||||
```bash
|
||||
cp /pfad/zur/roll_calculator.html templates/
|
||||
```
|
||||
|
||||
## 5. Dependencies installieren
|
||||
|
||||
```bash
|
||||
pip install -r requirements.txt
|
||||
```
|
||||
|
||||
## 6. App starten
|
||||
|
||||
```bash
|
||||
python app.py
|
||||
```
|
||||
|
||||
✅ Server läuft unter: **http://localhost:5000**
|
||||
|
||||
---
|
||||
|
||||
## 🔐 Teste die Authentication
|
||||
|
||||
Öffne http://localhost:5000 im Browser
|
||||
|
||||
**Test-Login:**
|
||||
- Benutzer: `beta`
|
||||
- Passwort: `rollcalc_beta_2026`
|
||||
|
||||
---
|
||||
|
||||
## 📁 Finale Verzeichnis-Struktur
|
||||
|
||||
```
|
||||
rollcalculator-beta/
|
||||
├── app.py # Flask-Server
|
||||
├── requirements.txt # Dependencies
|
||||
├── README.md # Dokumentation
|
||||
├── access_log.json # (wird auto-erstellt)
|
||||
├── templates/
|
||||
│ └── roll_calculator.html # Deine HTML-Datei
|
||||
└── static/
|
||||
└── (optional: JSON, Service Worker, etc.)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Anpassungen vor Beta-Release
|
||||
|
||||
**In `app.py` ändern:**
|
||||
|
||||
```python
|
||||
# Zeile 15-16: Passwörter aktualisieren
|
||||
BETA_USERS = {
|
||||
"beta": "DEIN_SICHERES_PASSWORT_HIER",
|
||||
"naue": "WEITERES_PASSWORT_HIER"
|
||||
}
|
||||
|
||||
# Zeile 22-24: Admin-Passwort
|
||||
ADMIN_USERS = {
|
||||
"admin": "ADMIN_PASSWORT_SEHR_SICHER"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 📊 Access Logs prüfen
|
||||
|
||||
Nach einigen Logins: `access_log.json` öffnen und schauen:
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"timestamp": "2026-05-28T12:17:03.123456",
|
||||
"username": "beta",
|
||||
"endpoint": "/",
|
||||
"method": "GET",
|
||||
"status": 200
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## ✅ Checkliste vor Production
|
||||
|
||||
- [ ] Passwörter in `app.py` aktualisiert
|
||||
- [ ] `roll_calculator.html` in `templates/` vorhanden
|
||||
- [ ] `python app.py` startet ohne Fehler
|
||||
- [ ] Anmeldung funktioniert (Test-User)
|
||||
- [ ] HTTPS/Reverse-Proxy geplant
|
||||
- [ ] Access-Logs-Archivierung geplant
|
||||
- [ ] Admin-Dashboard für Monitoring erwünscht?
|
||||
|
||||
---
|
||||
|
||||
## 🆘 Häufige Probleme
|
||||
|
||||
**Problem:** `jinja2.exceptions.TemplateNotFound`
|
||||
→ Lösung: `templates/roll_calculator.html` muss existieren
|
||||
|
||||
**Problem:** `401 Unauthorized`
|
||||
→ Das ist normal! Gib Credentials ein (z.B. beta/rollcalc_beta_2026)
|
||||
|
||||
**Problem:** `ModuleNotFoundError: No module named 'flask'`
|
||||
→ Lösung: `pip install -r requirements.txt`
|
||||
|
||||
---
|
||||
|
||||
## 🎯 Nächste Schritte
|
||||
|
||||
1. **Tests:** Alle Funktionen mit echten Benutzern testen
|
||||
2. **Monitoring:** Access-Logs regelmäßig überprüfen
|
||||
3. **Feedback:** Beta-Tester-Feedback sammeln
|
||||
4. **Production:** Nach Release-Freigabe produktiv nehmen
|
||||
|
||||
---
|
||||
|
||||
Viel Erfolg mit der Beta-Phase! 🚀
|
||||
|
||||
Martin Tazl
|
||||
*Roll Calculator – Naue GmbH & Co. KG*
|
||||
@@ -0,0 +1,226 @@
|
||||
# Naue Roll Calculator – Flask Beta Deployment
|
||||
|
||||
## Überblick
|
||||
|
||||
Diese Flask-Anwendung schützt den Roll Diameter Calculator mit **HTTP Basic Authentication**.
|
||||
Benutzer müssen sich mit Benutzername und Passwort anmelden, bevor sie auf die App zugreifen können.
|
||||
|
||||
---
|
||||
|
||||
## Installation & Setup
|
||||
|
||||
### 1. Abhängigkeiten installieren
|
||||
|
||||
```bash
|
||||
pip install -r requirements.txt
|
||||
```
|
||||
|
||||
### 2. HTML-Template einbinden
|
||||
|
||||
Kopiere deine ursprüngliche `roll_calculator.html` vollständig in:
|
||||
```
|
||||
templates/roll_calculator.html
|
||||
```
|
||||
|
||||
Falls du noch die statischen Dateien brauchst (JSON-Dateien, Service Worker):
|
||||
```bash
|
||||
mkdir -p static
|
||||
# Kopiere article-data.json, config.json, service-worker.js (optional) in static/
|
||||
```
|
||||
|
||||
### 3. App starten
|
||||
|
||||
```bash
|
||||
python app.py
|
||||
```
|
||||
|
||||
Server läuft dann unter: **http://localhost:5000**
|
||||
|
||||
---
|
||||
|
||||
## Test-Zugänge (Standard-Beta-Benutzer)
|
||||
|
||||
| Benutzer | Passwort | Rolle |
|
||||
|----------|----------------------|-------------|
|
||||
| `beta` | `rollcalc_beta_2026` | User |
|
||||
| `naue` | `naue_access_2026` | User |
|
||||
| `admin` | `admin_secure_pwd_2026` | Admin |
|
||||
|
||||
> ⚠️ **WICHTIG:** Vor Produktivbereitstellung **ALLE PASSWÖRTER ÄNDERN**!
|
||||
|
||||
---
|
||||
|
||||
## Authentifizierung
|
||||
|
||||
### HTTP Basic Auth
|
||||
- Browser zeigt automatisch ein Login-Popup
|
||||
- Credentials werden Base64-codiert mit jedem Request mitgesendet
|
||||
- **Nur über HTTPS verwenden!** (in Production)
|
||||
|
||||
### Neue Benutzer hinzufügen
|
||||
|
||||
In `app.py` die `BETA_USERS` oder `ADMIN_USERS` Dictionaries anpassen:
|
||||
|
||||
```python
|
||||
BETA_USERS = {
|
||||
"beta": "rollcalc_beta_2026",
|
||||
"neuer_user": "neues_passwort_hier" # ← Neu
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Features
|
||||
|
||||
✅ HTTP Basic Auth (Browser-Standard)
|
||||
✅ Audit-Logging (access_log.json)
|
||||
✅ Admin-Endpoints (/admin/logs)
|
||||
✅ Static Files Protection
|
||||
✅ CORS-ready (für zukünftige APIs)
|
||||
✅ Health Check Endpoint
|
||||
|
||||
---
|
||||
|
||||
## API-Endpunkte
|
||||
|
||||
```
|
||||
GET / → HTML-Seite (geschützt)
|
||||
GET /static/<file> → Statische Dateien (geschützt)
|
||||
GET /api/health → Health Check (geschützt)
|
||||
GET /api/user → Authentifizierter Benutzer Info (geschützt)
|
||||
GET /admin/logs → Access Logs (Admin-only)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Sicherheit für Production
|
||||
|
||||
1. **Passwörter aktualisieren**
|
||||
```python
|
||||
BETA_USERS = {"realuser": "komplexes_passwort_mindestens_16_zeichen"}
|
||||
```
|
||||
|
||||
2. **HTTPS erzwingen**
|
||||
- Reverse Proxy (nginx, Apache)
|
||||
- SSL/TLS Certificate
|
||||
|
||||
3. **Umgebungsvariablen nutzen** (statt hardcoded)
|
||||
```python
|
||||
import os
|
||||
BETA_USERS = {
|
||||
"beta": os.getenv("BETA_PASSWORD", "default")
|
||||
}
|
||||
```
|
||||
|
||||
4. **Debug deaktivieren**
|
||||
```python
|
||||
app.run(debug=False) # In Production
|
||||
```
|
||||
|
||||
5. **Rate Limiting hinzufügen**
|
||||
```bash
|
||||
pip install Flask-Limiter
|
||||
```
|
||||
|
||||
6. **Access Logs regelmäßig archivieren**
|
||||
```bash
|
||||
gzip access_log.json
|
||||
rm access_log.json
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Dateistruktur
|
||||
|
||||
```
|
||||
project/
|
||||
├── app.py # Flask-Applikation (mit HTTP Basic Auth)
|
||||
├── requirements.txt # Python Dependencies
|
||||
├── access_log.json # Auto-generiert (Audit Trail)
|
||||
├── templates/
|
||||
│ └── roll_calculator.html # ← HTML-Template hier einfügen
|
||||
├── static/
|
||||
│ ├── article-data.json # (optional)
|
||||
│ ├── config.json # (optional)
|
||||
│ └── service-worker.js # (optional)
|
||||
└── README.md # Diese Datei
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "401 Unauthorized" beim Öffnen von http://localhost:5000
|
||||
|
||||
✓ Das ist normal! Browser zeigt automatisch ein Auth-Dialog.
|
||||
✓ Gib Benutzername/Passwort ein (z.B. `beta` / `rollcalc_beta_2026`)
|
||||
|
||||
### "template not found"
|
||||
|
||||
✓ Stelle sicher, dass `templates/roll_calculator.html` existiert
|
||||
✓ HTML-Datei muss vollständig sein (mit allen Scripts)
|
||||
|
||||
### "404 Not Found" bei article-data.json
|
||||
|
||||
✓ Ist optional. Falls benötigt:
|
||||
- Kopiere `article-data.json` in `static/`
|
||||
- Oder erweitere den /static-Route in app.py
|
||||
|
||||
---
|
||||
|
||||
## Logging
|
||||
|
||||
Alle erfolgreichen und fehlgeschlagenen Login-Versuche werden in `access_log.json` geloggt:
|
||||
|
||||
```json
|
||||
[
|
||||
{
|
||||
"timestamp": "2026-05-28T12:16:41.123456",
|
||||
"username": "beta",
|
||||
"endpoint": "/",
|
||||
"method": "GET",
|
||||
"status": 200
|
||||
}
|
||||
]
|
||||
```
|
||||
|
||||
Admin-Benutzer können Logs ansehen unter `/admin/logs` (JSON-Format).
|
||||
|
||||
---
|
||||
|
||||
## Deployment-Optionen
|
||||
|
||||
### Option 1: Docker
|
||||
```dockerfile
|
||||
FROM python:3.11-slim
|
||||
WORKDIR /app
|
||||
COPY requirements.txt .
|
||||
RUN pip install -r requirements.txt
|
||||
COPY . .
|
||||
CMD ["python", "app.py"]
|
||||
```
|
||||
|
||||
### Option 2: Systemd Service (Linux)
|
||||
```ini
|
||||
[Service]
|
||||
ExecStart=/usr/bin/python3 /path/to/app.py
|
||||
Restart=always
|
||||
WorkingDirectory=/path/to/
|
||||
```
|
||||
|
||||
### Option 3: Gunicorn (Production)
|
||||
```bash
|
||||
pip install gunicorn
|
||||
gunicorn -w 4 -b 0.0.0.0:5000 app:app
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Fragen?
|
||||
|
||||
Kontakt: Produktionsplanung / Logistik / Produktmanagement
|
||||
|
||||
---
|
||||
|
||||
**Naue GmbH & Co. KG**
|
||||
Roll Diameter Calculator – Beta Phase 2026
|
||||
@@ -0,0 +1,568 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="theme-color" content="#0066cc">
|
||||
<title>Admin Panel – Roll Calculator</title>
|
||||
<style>
|
||||
* { margin: 0; padding: 0; box-sizing: border-box; }
|
||||
|
||||
body {
|
||||
font-family: 'Segoe UI', Arial, sans-serif;
|
||||
background: #f4f6f9;
|
||||
color: #333;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
/* ---- HEADER ---- */
|
||||
.admin-header {
|
||||
background: linear-gradient(135deg, #003366 0%, #0066cc 100%);
|
||||
color: white;
|
||||
padding: 20px 32px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.2);
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.admin-header h1 {
|
||||
font-size: 24px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
|
||||
.admin-header .subtitle {
|
||||
font-size: 12px;
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
.admin-header .user-info {
|
||||
font-size: 12px;
|
||||
opacity: 0.9;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.admin-header .user-info strong {
|
||||
opacity: 1;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* ---- CONTAINER ---- */
|
||||
.admin-container {
|
||||
max-width: 1300px;
|
||||
margin: 30px auto;
|
||||
padding: 0 20px 60px;
|
||||
}
|
||||
|
||||
/* ---- STATS GRID ---- */
|
||||
.stats-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
|
||||
gap: 20px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.stat-card {
|
||||
background: white;
|
||||
border-radius: 10px;
|
||||
padding: 20px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.07);
|
||||
border-left: 4px solid #0066cc;
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
}
|
||||
|
||||
.stat-card:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 12px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
.stat-card.warning {
|
||||
border-left-color: #f0b429;
|
||||
}
|
||||
|
||||
.stat-card.danger {
|
||||
border-left-color: #dc3545;
|
||||
}
|
||||
|
||||
.stat-card .label {
|
||||
font-size: 12px;
|
||||
color: #666;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.4px;
|
||||
margin-bottom: 8px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.stat-card .value {
|
||||
font-size: 36px;
|
||||
font-weight: 700;
|
||||
color: #0066cc;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.stat-card.warning .value {
|
||||
color: #f0b429;
|
||||
}
|
||||
|
||||
.stat-card.danger .value {
|
||||
color: #dc3545;
|
||||
}
|
||||
|
||||
.stat-card .sublabel {
|
||||
font-size: 11px;
|
||||
color: #999;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
/* ---- LOGS SECTION ---- */
|
||||
.logs-section {
|
||||
background: white;
|
||||
border-radius: 10px;
|
||||
padding: 24px;
|
||||
box-shadow: 0 2px 8px rgba(0,0,0,0.07);
|
||||
}
|
||||
|
||||
.logs-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
flex-wrap: wrap;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.logs-header h2 {
|
||||
font-size: 18px;
|
||||
color: #003366;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.controls {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.btn {
|
||||
background: #0066cc;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 10px 20px;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
font-size: 13px;
|
||||
transition: background 0.2s;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
}
|
||||
|
||||
.btn:hover {
|
||||
background: #0052a3;
|
||||
}
|
||||
|
||||
.btn.secondary {
|
||||
background: #e0e0e0;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.btn.secondary:hover {
|
||||
background: #d0d0d0;
|
||||
}
|
||||
|
||||
.btn-refresh {
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
|
||||
.btn-refresh.spinning {
|
||||
animation: spin 1s linear infinite;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
from { transform: rotate(0deg); }
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
/* ---- TABLE ---- */
|
||||
.logs-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.logs-table thead {
|
||||
background: #f0f4fa;
|
||||
border-bottom: 2px solid #0066cc;
|
||||
}
|
||||
|
||||
.logs-table th {
|
||||
padding: 12px;
|
||||
text-align: left;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.logs-table td {
|
||||
padding: 10px 12px;
|
||||
border-bottom: 1px solid #e8ecf0;
|
||||
}
|
||||
|
||||
.logs-table tbody tr {
|
||||
transition: background 0.15s;
|
||||
}
|
||||
|
||||
.logs-table tbody tr:hover {
|
||||
background: #f8f9fa;
|
||||
}
|
||||
|
||||
.status-200 {
|
||||
color: #28a745;
|
||||
font-weight: 600;
|
||||
background: #f0f9f6;
|
||||
padding: 2px 6px;
|
||||
border-radius: 3px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.status-401 {
|
||||
color: #dc3545;
|
||||
font-weight: 600;
|
||||
background: #fff0f0;
|
||||
padding: 2px 6px;
|
||||
border-radius: 3px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.status-403 {
|
||||
color: #f0b429;
|
||||
font-weight: 600;
|
||||
background: #fffbea;
|
||||
padding: 2px 6px;
|
||||
border-radius: 3px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
/* ---- LOADING / EMPTY ---- */
|
||||
.loading {
|
||||
text-align: center;
|
||||
padding: 40px;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.empty {
|
||||
text-align: center;
|
||||
padding: 40px;
|
||||
color: #999;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.error {
|
||||
background: #fff0f0;
|
||||
color: #dc3545;
|
||||
padding: 12px;
|
||||
border-radius: 5px;
|
||||
border-left: 4px solid #dc3545;
|
||||
margin: 12px 0;
|
||||
}
|
||||
|
||||
/* ---- FILTERS ---- */
|
||||
.filters {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
margin-bottom: 20px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.filter-input {
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 5px;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.filter-input:focus {
|
||||
outline: none;
|
||||
border-color: #0066cc;
|
||||
box-shadow: 0 0 0 2px rgba(0,102,204,0.1);
|
||||
}
|
||||
|
||||
/* ---- FOOTER ---- */
|
||||
.admin-footer {
|
||||
text-align: center;
|
||||
font-size: 11px;
|
||||
color: #aaa;
|
||||
margin-top: 40px;
|
||||
padding-top: 20px;
|
||||
border-top: 1px solid #e8ecf0;
|
||||
}
|
||||
|
||||
/* ---- RESPONSIVE ---- */
|
||||
@media (max-width: 768px) {
|
||||
.admin-header {
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.admin-header .user-info {
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.stats-grid {
|
||||
grid-template-columns: 1fr;
|
||||
}
|
||||
|
||||
.logs-header {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.controls {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.btn {
|
||||
flex: 1;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.logs-table {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.logs-table th, .logs-table td {
|
||||
padding: 8px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<!-- HEADER -->
|
||||
<div class="admin-header">
|
||||
<div>
|
||||
<h1>🔐 Admin Panel</h1>
|
||||
<div class="subtitle">Roll Calculator – Naue GmbH & Co. KG</div>
|
||||
</div>
|
||||
<div class="user-info">
|
||||
<span>Angemeldet als:</span>
|
||||
<strong id="authUser">admin</strong>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- MAIN CONTAINER -->
|
||||
<div class="admin-container">
|
||||
|
||||
<!-- STATISTICS -->
|
||||
<div class="stats-grid" id="statsGrid">
|
||||
<div style="grid-column: 1 / -1; text-align: center; padding: 40px; color: #999;">
|
||||
⏳ Statistiken werden geladen...
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LOGS SECTION -->
|
||||
<div class="logs-section">
|
||||
|
||||
<!-- HEADER -->
|
||||
<div class="logs-header">
|
||||
<h2>📋 Access Logs</h2>
|
||||
<div class="controls">
|
||||
<button class="btn" id="refreshBtn" onclick="refreshData()">
|
||||
<span id="refreshIcon">🔄</span> Aktualisieren
|
||||
</button>
|
||||
<button class="btn secondary" onclick="downloadLogs()">
|
||||
⬇️ Download
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- FILTERS -->
|
||||
<div class="filters">
|
||||
<input
|
||||
type="text"
|
||||
class="filter-input"
|
||||
placeholder="Nach Benutzer filtern..."
|
||||
id="filterUser"
|
||||
onkeyup="filterLogs()"
|
||||
>
|
||||
<input
|
||||
type="text"
|
||||
class="filter-input"
|
||||
placeholder="Nach Endpoint filtern..."
|
||||
id="filterEndpoint"
|
||||
onkeyup="filterLogs()"
|
||||
>
|
||||
</div>
|
||||
|
||||
<!-- TABLE -->
|
||||
<div id="errorContainer"></div>
|
||||
|
||||
<table class="logs-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Zeitstempel</th>
|
||||
<th>Benutzer</th>
|
||||
<th>Endpoint</th>
|
||||
<th>Methode</th>
|
||||
<th style="width: 80px;">Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="logsList">
|
||||
<tr>
|
||||
<td colspan="5" class="loading">Logs werden geladen...</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- FOOTER -->
|
||||
<div class="admin-footer">
|
||||
ℹ️ Logs werden automatisch alle 30 Sekunden aktualisiert |
|
||||
Letztes Update: <span id="lastUpdate">-</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- SCRIPTS -->
|
||||
<script>
|
||||
let allLogs = [];
|
||||
|
||||
// Get authenticated user from API
|
||||
async function getAuthUser() {
|
||||
try {
|
||||
const res = await fetch('/api/user');
|
||||
const data = await res.json();
|
||||
document.getElementById('authUser').textContent = data.username || 'admin';
|
||||
} catch (e) {
|
||||
console.warn('Konnte Benutzerinformation nicht laden');
|
||||
}
|
||||
}
|
||||
|
||||
// Refresh Data (Statistiken + Logs)
|
||||
async function refreshData() {
|
||||
const btn = document.getElementById('refreshBtn');
|
||||
const icon = document.getElementById('refreshIcon');
|
||||
|
||||
try {
|
||||
icon.style.animation = 'spin 1s linear infinite';
|
||||
|
||||
// Load Statistics
|
||||
const statsRes = await fetch('/api/admin/stats');
|
||||
if (!statsRes.ok) throw new Error('Statistiken konnten nicht geladen werden');
|
||||
const stats = await statsRes.json();
|
||||
|
||||
// Load Logs
|
||||
const logsRes = await fetch('/api/admin/logs');
|
||||
if (!logsRes.ok) throw new Error('Logs konnten nicht geladen werden');
|
||||
const logsData = await logsRes.json();
|
||||
|
||||
allLogs = logsData.logs || [];
|
||||
|
||||
// Render Statistics
|
||||
renderStats(stats);
|
||||
|
||||
// Render Logs
|
||||
renderLogs(allLogs);
|
||||
|
||||
// Update timestamp
|
||||
document.getElementById('lastUpdate').textContent = new Date().toLocaleTimeString('de-DE');
|
||||
|
||||
// Clear error
|
||||
document.getElementById('errorContainer').innerHTML = '';
|
||||
|
||||
} catch (error) {
|
||||
console.error('Fehler beim Laden der Daten:', error);
|
||||
document.getElementById('errorContainer').innerHTML =
|
||||
'<div class="error">❌ ' + error.message + '</div>';
|
||||
} finally {
|
||||
icon.style.animation = 'none';
|
||||
}
|
||||
}
|
||||
|
||||
// Render Statistics
|
||||
function renderStats(stats) {
|
||||
const html = `
|
||||
<div class="stat-card">
|
||||
<div class="label">📊 Gesamte Anfragen</div>
|
||||
<div class="value">${stats.total_requests || 0}</div>
|
||||
</div>
|
||||
<div class="stat-card">
|
||||
<div class="label">👥 Eindeutige Benutzer</div>
|
||||
<div class="value">${stats.unique_users || 0}</div>
|
||||
</div>
|
||||
<div class="stat-card danger">
|
||||
<div class="label">⛔ Fehlgeschlagene Logins</div>
|
||||
<div class="value">${stats.failed_logins || 0}</div>
|
||||
</div>
|
||||
`;
|
||||
document.getElementById('statsGrid').innerHTML = html;
|
||||
}
|
||||
|
||||
// Render Logs
|
||||
function renderLogs(logs) {
|
||||
if (!logs || logs.length === 0) {
|
||||
document.getElementById('logsList').innerHTML =
|
||||
'<tr><td colspan="5" class="empty">Keine Logs verfügbar</td></tr>';
|
||||
return;
|
||||
}
|
||||
|
||||
const html = logs.reverse().map(log => {
|
||||
const time = new Date(log.timestamp).toLocaleString('de-DE');
|
||||
const statusClass = `status-${log.status}`;
|
||||
return `
|
||||
<tr>
|
||||
<td>${time}</td>
|
||||
<td><strong>${log.username}</strong></td>
|
||||
<td><code>${log.endpoint}</code></td>
|
||||
<td>${log.method}</td>
|
||||
<td><span class="${statusClass}">${log.status}</span></td>
|
||||
</tr>
|
||||
`;
|
||||
}).join('');
|
||||
|
||||
document.getElementById('logsList').innerHTML = html;
|
||||
}
|
||||
|
||||
// Filter Logs
|
||||
function filterLogs() {
|
||||
const userFilter = document.getElementById('filterUser').value.toLowerCase();
|
||||
const endpointFilter = document.getElementById('filterEndpoint').value.toLowerCase();
|
||||
|
||||
const filtered = allLogs.filter(log =>
|
||||
log.username.toLowerCase().includes(userFilter) &&
|
||||
log.endpoint.toLowerCase().includes(endpointFilter)
|
||||
);
|
||||
|
||||
renderLogs(filtered);
|
||||
}
|
||||
|
||||
// Download Logs as JSON
|
||||
function downloadLogs() {
|
||||
const data = JSON.stringify(allLogs, null, 2);
|
||||
const blob = new Blob([data], { type: 'application/json' });
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = `access-logs-${new Date().toISOString()}.json`;
|
||||
a.click();
|
||||
window.URL.revokeObjectURL(url);
|
||||
}
|
||||
|
||||
// Initialize
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
getAuthUser();
|
||||
refreshData();
|
||||
|
||||
// Auto-refresh every 30 seconds
|
||||
setInterval(refreshData, 30000);
|
||||
});
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,179 @@
|
||||
"""
|
||||
ADMIN ROUTES FÜR app.py
|
||||
|
||||
Diese Routes sollten zu app.py hinzugefügt werden (nach den Error Handlers, vor if __name__)
|
||||
"""
|
||||
|
||||
# ============================================================================
|
||||
# ADMIN ROUTES (diese zeilen in app.py hinzufügen!)
|
||||
# ============================================================================
|
||||
|
||||
@app.route("/admin", methods=["GET"])
|
||||
@auth.login_required
|
||||
def admin_dashboard():
|
||||
"""Admin Dashboard - nur für Admin-Benutzer"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/admin", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized - Admin access required"}), 403
|
||||
|
||||
log_access(user, "/admin", "GET")
|
||||
return render_template("admin.html")
|
||||
|
||||
|
||||
@app.route("/api/admin/stats", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_admin_stats():
|
||||
"""Statistiken für Admin Dashboard"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/api/admin/stats", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/api/admin/stats", "GET")
|
||||
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
try:
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
logs = []
|
||||
|
||||
# Berechne Statistiken
|
||||
total_requests = len(logs)
|
||||
unique_users = len(set(log.get("username", "unknown") for log in logs))
|
||||
failed_logins = len([l for l in logs if l.get("status") == 401])
|
||||
|
||||
return jsonify({
|
||||
"total_requests": total_requests,
|
||||
"unique_users": unique_users,
|
||||
"failed_logins": failed_logins,
|
||||
"timestamp": datetime.now().isoformat()
|
||||
}), 200
|
||||
|
||||
|
||||
@app.route("/api/admin/logs", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_admin_logs():
|
||||
"""Access Logs für Admin Dashboard"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/api/admin/logs", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/api/admin/logs", "GET")
|
||||
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
try:
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
logs = []
|
||||
|
||||
# Sortiere nach Zeitstempel absteigend (neueste zuerst)
|
||||
logs_sorted = sorted(logs, key=lambda x: x.get("timestamp", ""), reverse=True)
|
||||
|
||||
# Optionales Limit (letzte 500 Logs)
|
||||
return jsonify({"logs": logs_sorted[-500:]}), 200
|
||||
|
||||
|
||||
@app.route("/api/admin/export", methods=["GET"])
|
||||
@auth.login_required
|
||||
def export_logs():
|
||||
"""Exportiere Logs als CSV/JSON"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/api/admin/export", "GET")
|
||||
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
try:
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
except json.JSONDecodeError:
|
||||
logs = []
|
||||
|
||||
# Optional: Als CSV exportieren
|
||||
fmt = request.args.get("format", "json")
|
||||
|
||||
if fmt == "csv":
|
||||
import csv
|
||||
from io import StringIO
|
||||
|
||||
output = StringIO()
|
||||
writer = csv.DictWriter(output, fieldnames=["timestamp", "username", "endpoint", "method", "status"])
|
||||
writer.writeheader()
|
||||
writer.writerows(logs)
|
||||
|
||||
response = app.make_response(output.getvalue())
|
||||
response.headers["Content-Disposition"] = f"attachment; filename=logs_{datetime.now().strftime('%Y%m%d_%H%M%S')}.csv"
|
||||
response.headers["Content-Type"] = "text/csv"
|
||||
return response
|
||||
else:
|
||||
response = app.make_response(json.dumps(logs, indent=2))
|
||||
response.headers["Content-Disposition"] = f"attachment; filename=logs_{datetime.now().strftime('%Y%m%d_%H%M%S')}.json"
|
||||
response.headers["Content-Type"] = "application/json"
|
||||
return response
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# OPTIONAL: Admin-Utility-Routes
|
||||
# ============================================================================
|
||||
|
||||
@app.route("/api/admin/clear-logs", methods=["POST"])
|
||||
@auth.login_required
|
||||
def clear_logs():
|
||||
"""Lösche alle Logs (nur für Admin, mit Bestätigung)"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
# Safety: Verlange "confirm=true" Query Parameter
|
||||
confirm = request.args.get("confirm") == "true"
|
||||
if not confirm:
|
||||
return jsonify({"error": "Confirmation required (add ?confirm=true)"}), 400
|
||||
|
||||
log_access(user, "/api/admin/clear-logs", "POST")
|
||||
|
||||
# Backup erstellen vor dem Löschen
|
||||
if os.path.exists(LOG_FILE):
|
||||
backup_file = LOG_FILE + f".backup_{datetime.now().strftime('%Y%m%d_%H%M%S')}"
|
||||
import shutil
|
||||
shutil.copy(LOG_FILE, backup_file)
|
||||
|
||||
# Logs leeren
|
||||
with open(LOG_FILE, "w") as f:
|
||||
json.dump([], f)
|
||||
|
||||
return jsonify({
|
||||
"status": "success",
|
||||
"message": "Alle Logs wurden gelöscht (Backup erstellt)"
|
||||
}), 200
|
||||
|
||||
|
||||
@app.route("/api/admin/system-info", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_system_info():
|
||||
"""System-Information für Admin"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/api/admin/system-info", "GET")
|
||||
|
||||
import psutil
|
||||
|
||||
return jsonify({
|
||||
"environment": os.getenv("FLASK_ENV", "production"),
|
||||
"debug_mode": app.debug,
|
||||
"database_file": LOG_FILE,
|
||||
"database_size_kb": os.path.getsize(LOG_FILE) / 1024 if os.path.exists(LOG_FILE) else 0,
|
||||
"timestamp": datetime.now().isoformat(),
|
||||
# Optional: CPU/RAM Info
|
||||
# "cpu_percent": psutil.cpu_percent(),
|
||||
# "memory_percent": psutil.virtual_memory().percent,
|
||||
}), 200
|
||||
@@ -0,0 +1,167 @@
|
||||
"""
|
||||
Naue Roll Calculator - Beta
|
||||
Flask app with HTTP Basic Authentication
|
||||
"""
|
||||
|
||||
from flask import Flask, render_template, request, send_file, send_from_directory, jsonify
|
||||
from flask_httpauth import HTTPBasicAuth
|
||||
from functools import wraps
|
||||
import os
|
||||
from datetime import datetime
|
||||
import json
|
||||
|
||||
app = Flask(__name__)
|
||||
auth = HTTPBasicAuth()
|
||||
|
||||
# ============================================================================
|
||||
# CONFIGURATION
|
||||
# ============================================================================
|
||||
|
||||
# Benutzer für Beta-Phase (in Produktion aus env-Variablen laden!)
|
||||
BETA_USERS = {
|
||||
"beta": "rollcalc_beta_2026", # Ändere das Passwort!
|
||||
"naue": "naue_access_2026" # Zweiter User optional
|
||||
}
|
||||
|
||||
# Optional: Admin-Features (z.B. Logs, Stats)
|
||||
ADMIN_USERS = {
|
||||
"admin": "admin_secure_pwd_2026"
|
||||
}
|
||||
|
||||
# Logging für Auditing
|
||||
LOG_FILE = "access_log.json"
|
||||
|
||||
# ============================================================================
|
||||
# AUTHENTICATION
|
||||
# ============================================================================
|
||||
|
||||
@auth.verify_password
|
||||
def verify_password(username, password):
|
||||
"""Verify HTTP Basic Auth credentials"""
|
||||
all_users = {**BETA_USERS, **ADMIN_USERS}
|
||||
if username in all_users and all_users[username] == password:
|
||||
return username
|
||||
return None
|
||||
|
||||
def log_access(username, endpoint, method, status=200):
|
||||
"""Log all access attempts for audit trail"""
|
||||
log_entry = {
|
||||
"timestamp": datetime.now().isoformat(),
|
||||
"username": username,
|
||||
"endpoint": endpoint,
|
||||
"method": method,
|
||||
"status": status
|
||||
}
|
||||
try:
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
logs.append(log_entry)
|
||||
with open(LOG_FILE, "w") as f:
|
||||
json.dump(logs, f, indent=2)
|
||||
except Exception as e:
|
||||
print(f"[Logging Error] {e}")
|
||||
|
||||
# ============================================================================
|
||||
# ROUTES
|
||||
# ============================================================================
|
||||
|
||||
@app.route("/", methods=["GET"])
|
||||
@auth.login_required
|
||||
def index():
|
||||
"""Main calculator page - requires authentication"""
|
||||
log_access(auth.current_user(), "/", "GET")
|
||||
return render_template("roll_calculator.html")
|
||||
|
||||
@app.route("/static/<path:filename>", methods=["GET"])
|
||||
@auth.login_required
|
||||
def serve_static(filename):
|
||||
"""Serve static files (CSS, JS, JSON) - protected"""
|
||||
log_access(auth.current_user(), f"/static/{filename}", "GET")
|
||||
return send_from_directory("static", filename)
|
||||
|
||||
@app.route("/api/health", methods=["GET"])
|
||||
@auth.login_required
|
||||
def health_check():
|
||||
"""Simple health check endpoint"""
|
||||
return jsonify({"status": "ok", "version": "1.0.0-beta"}), 200
|
||||
|
||||
@app.route("/api/user", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_user():
|
||||
"""Get current authenticated user info"""
|
||||
user = auth.current_user()
|
||||
is_admin = user in ADMIN_USERS
|
||||
return jsonify({
|
||||
"username": user,
|
||||
"authenticated": True,
|
||||
"is_admin": is_admin,
|
||||
"timestamp": datetime.now().isoformat()
|
||||
}), 200
|
||||
|
||||
# Admin-only endpoint (optional)
|
||||
@app.route("/admin/logs", methods=["GET"])
|
||||
@auth.login_required
|
||||
def get_logs():
|
||||
"""View access logs - admin only"""
|
||||
user = auth.current_user()
|
||||
if user not in ADMIN_USERS:
|
||||
log_access(user, "/admin/logs", "GET", 403)
|
||||
return jsonify({"error": "Unauthorized"}), 403
|
||||
|
||||
log_access(user, "/admin/logs", "GET")
|
||||
logs = []
|
||||
if os.path.exists(LOG_FILE):
|
||||
with open(LOG_FILE, "r") as f:
|
||||
logs = json.load(f)
|
||||
return jsonify({"logs": logs}), 200
|
||||
|
||||
# ============================================================================
|
||||
# ERROR HANDLERS
|
||||
# ============================================================================
|
||||
|
||||
@app.errorhandler(401)
|
||||
def unauthorized(e):
|
||||
"""Handle 401 Unauthorized - browser will prompt for credentials"""
|
||||
return jsonify({"error": "Unauthorized - please provide valid credentials"}), 401
|
||||
|
||||
@app.errorhandler(404)
|
||||
def not_found(e):
|
||||
"""Handle 404 Not Found"""
|
||||
return jsonify({"error": "Not found"}), 404
|
||||
|
||||
@app.errorhandler(500)
|
||||
def internal_error(e):
|
||||
"""Handle 500 Internal Server Error"""
|
||||
return jsonify({"error": "Internal server error"}), 500
|
||||
|
||||
# ============================================================================
|
||||
# STARTUP
|
||||
# ============================================================================
|
||||
|
||||
if __name__ == "__main__":
|
||||
# Erstelle templates-Verzeichnis falls nicht vorhanden
|
||||
os.makedirs("templates", exist_ok=True)
|
||||
os.makedirs("static", exist_ok=True)
|
||||
|
||||
print("""
|
||||
╔═══════════════════════════════════════════════════════════╗
|
||||
║ Naue Roll Calculator - Beta ║
|
||||
║ HTTP Basic Auth Enabled ║
|
||||
║ ║
|
||||
║ Test credentials: ║
|
||||
║ User: beta / Password: rollcalc_beta_2026 ║
|
||||
║ User: admin / Password: admin_secure_pwd_2026 ║
|
||||
║ ║
|
||||
║ Starten auf: http://localhost:5000 ║
|
||||
║ ⚠️ ÄNDERE DIE PASSWÖRTER VOR PRODUKTIVBEREITSTELLUNG! ║
|
||||
╚═══════════════════════════════════════════════════════════╝
|
||||
""")
|
||||
|
||||
app.run(
|
||||
host="0.0.0.0",
|
||||
port=5000,
|
||||
debug=False, # In Produktion: False
|
||||
use_reloader=True
|
||||
)
|
||||
@@ -0,0 +1,68 @@
|
||||
"""
|
||||
Naue Roll Calculator – Production Configuration Template
|
||||
|
||||
Nutze diese Datei als Vorlage für Produktionsumgebungen.
|
||||
Speichere sensible Daten in Umgebungsvariablen oder verschlüsselten Config-Files!
|
||||
"""
|
||||
|
||||
import os
|
||||
from datetime import timedelta
|
||||
|
||||
# ============================================================================
|
||||
# ENVIRONMENT
|
||||
# ============================================================================
|
||||
|
||||
ENV = os.getenv("FLASK_ENV", "production")
|
||||
DEBUG = os.getenv("DEBUG", "False").lower() == "true"
|
||||
|
||||
# ============================================================================
|
||||
# AUTHENTICATION
|
||||
# ============================================================================
|
||||
|
||||
# Benutzer aus Umgebungsvariablen laden (Docker/K8s)
|
||||
BETA_USERS = {
|
||||
os.getenv("BETA_USER_1", "beta"): os.getenv("BETA_PASS_1", "changeme"),
|
||||
}
|
||||
|
||||
ADMIN_USERS = {
|
||||
os.getenv("ADMIN_USER", "admin"): os.getenv("ADMIN_PASS", "changeme"),
|
||||
}
|
||||
|
||||
# ============================================================================
|
||||
# SECURITY
|
||||
# ============================================================================
|
||||
|
||||
SECRET_KEY = os.getenv("SECRET_KEY", "CHANGE_ME_IN_PRODUCTION")
|
||||
SESSION_COOKIE_SECURE = True # HTTPS only
|
||||
SESSION_COOKIE_HTTPONLY = True
|
||||
SESSION_COOKIE_SAMESITE = "Lax"
|
||||
PERMANENT_SESSION_LIFETIME = timedelta(hours=8)
|
||||
|
||||
# ============================================================================
|
||||
# LOGGING
|
||||
# ============================================================================
|
||||
|
||||
LOG_FILE = os.getenv("LOG_FILE", "access_log.json")
|
||||
LOG_ROTATION = os.getenv("LOG_ROTATION", "daily") # daily, weekly, monthly
|
||||
|
||||
# ============================================================================
|
||||
# RATE LIMITING (optional)
|
||||
# ============================================================================
|
||||
|
||||
RATELIMIT_ENABLED = os.getenv("RATELIMIT_ENABLED", "True").lower() == "true"
|
||||
RATELIMIT_DEFAULT = "100 per hour" # Max 100 requests pro Stunde
|
||||
|
||||
# ============================================================================
|
||||
# MONITORING
|
||||
# ============================================================================
|
||||
|
||||
SENTRY_DSN = os.getenv("SENTRY_DSN", None) # Optional: Error Tracking
|
||||
DATADOG_ENABLED = os.getenv("DATADOG_ENABLED", "False").lower() == "true"
|
||||
|
||||
# ============================================================================
|
||||
# DATABASE (falls später benötigt)
|
||||
# ============================================================================
|
||||
|
||||
DB_URL = os.getenv("DATABASE_URL", None)
|
||||
|
||||
print(f"[Config] Environment: {ENV}, Debug: {DEBUG}")
|
||||
@@ -0,0 +1,107 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Automatischer Fix für article-data.json Fetch-URLs in Flask
|
||||
Ersetzt relative URLs durch /static/ URLs
|
||||
"""
|
||||
|
||||
import re
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
def fix_html_file(html_path):
|
||||
"""Ersetzt die alten Fetch-URLs durch die neuen Flask-URLs"""
|
||||
|
||||
if not os.path.exists(html_path):
|
||||
print(f"❌ Datei nicht gefunden: {html_path}")
|
||||
return False
|
||||
|
||||
print(f"📖 Öffne: {html_path}")
|
||||
|
||||
with open(html_path, 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
|
||||
original_content = content
|
||||
changes = []
|
||||
|
||||
# Fix 1: fetch('article-data.json') → fetch('/static/article-data.json')
|
||||
if "fetch('article-data.json')" in content or 'fetch("article-data.json")' in content:
|
||||
content = content.replace("fetch('article-data.json')", "fetch('/static/article-data.json')")
|
||||
content = content.replace('fetch("article-data.json")', 'fetch("/static/article-data.json")')
|
||||
changes.append("✓ article-data.json URL aktualisiert")
|
||||
|
||||
# Fix 2: fetch('config.json') → fetch('/static/config.json')
|
||||
if "fetch('config.json')" in content or 'fetch("config.json")' in content:
|
||||
content = content.replace("fetch('config.json')", "fetch('/static/config.json')")
|
||||
content = content.replace('fetch("config.json")', 'fetch("/static/config.json")')
|
||||
changes.append("✓ config.json URL aktualisiert")
|
||||
|
||||
# Fix 3: register('service-worker.js') → register('/static/service-worker.js')
|
||||
if "register('service-worker.js')" in content or 'register("service-worker.js")' in content:
|
||||
content = content.replace("register('service-worker.js')", "register('/static/service-worker.js')")
|
||||
content = content.replace('register("service-worker.js")', 'register("/static/service-worker.js")')
|
||||
changes.append("✓ service-worker.js URL aktualisiert")
|
||||
|
||||
if content != original_content:
|
||||
# Backup erstellen
|
||||
backup_path = html_path + ".backup"
|
||||
with open(backup_path, 'w', encoding='utf-8') as f:
|
||||
f.write(original_content)
|
||||
print(f"💾 Backup erstellt: {backup_path}")
|
||||
|
||||
# Neue Version speichern
|
||||
with open(html_path, 'w', encoding='utf-8') as f:
|
||||
f.write(content)
|
||||
|
||||
print(f"✅ HTML aktualisiert: {html_path}")
|
||||
for change in changes:
|
||||
print(f" {change}")
|
||||
return True
|
||||
else:
|
||||
print("⚠️ Keine Änderungen notwendig (URLs sind bereits korrekt)")
|
||||
return False
|
||||
|
||||
def check_static_files():
|
||||
"""Prüft ob die benötigten Dateien im static/ Ordner sind"""
|
||||
print("\n🔍 Prüfe static/ Verzeichnis...")
|
||||
|
||||
files_to_check = ['article-data.json', 'config.json']
|
||||
found = []
|
||||
missing = []
|
||||
|
||||
for filename in files_to_check:
|
||||
path = os.path.join('static', filename)
|
||||
if os.path.exists(path):
|
||||
size = os.path.getsize(path)
|
||||
found.append(f" ✓ {filename} ({size} bytes)")
|
||||
else:
|
||||
missing.append(f" ❌ {filename} (NICHT GEFUNDEN)")
|
||||
|
||||
for msg in found:
|
||||
print(msg)
|
||||
for msg in missing:
|
||||
print(msg)
|
||||
|
||||
return len(missing) == 0
|
||||
|
||||
if __name__ == "__main__":
|
||||
print("=" * 60)
|
||||
print("Fix für article-data.json Flask-URLs")
|
||||
print("=" * 60)
|
||||
|
||||
html_file = "templates/roll_calculator.html"
|
||||
|
||||
success = fix_html_file(html_file)
|
||||
files_ok = check_static_files()
|
||||
|
||||
print("\n" + "=" * 60)
|
||||
if success or files_ok:
|
||||
print("✅ Fix abgeschlossen!")
|
||||
print("\n📝 Nächste Schritte:")
|
||||
print(" 1. Browser neuladen (Ctrl+Shift+R)")
|
||||
print(" 2. Öffne Browser Console (F12)")
|
||||
print(" 3. Du solltest sehen:")
|
||||
print(" 'Article data loaded: XXX items'")
|
||||
print(" 'Config updated from file'")
|
||||
else:
|
||||
print("⚠️ Keine Änderungen nötig")
|
||||
print("=" * 60)
|
||||
@@ -0,0 +1,40 @@
|
||||
# Python
|
||||
__pycache__/
|
||||
*.pyc
|
||||
*.pyo
|
||||
*.pyd
|
||||
.Python
|
||||
env/
|
||||
venv/
|
||||
.venv
|
||||
*.egg-info/
|
||||
dist/
|
||||
build/
|
||||
|
||||
# Logging
|
||||
access_log.json
|
||||
*.log
|
||||
|
||||
# IDE
|
||||
.vscode/
|
||||
.idea/
|
||||
*.swp
|
||||
*.swo
|
||||
*~
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
# Flask
|
||||
instance/
|
||||
.webassets-cache
|
||||
|
||||
# Testing
|
||||
.pytest_cache/
|
||||
.coverage
|
||||
|
||||
# Environment
|
||||
.env
|
||||
.env.local
|
||||
.env.*.local
|
||||
@@ -0,0 +1,7 @@
|
||||
Flask==2.3.3
|
||||
Flask-HTTPAuth==4.8.0
|
||||
Werkzeug==2.3.7
|
||||
click==8.1.7
|
||||
itsdangerous==2.1.2
|
||||
Jinja2==3.1.2
|
||||
MarkupSafe==2.1.3
|
||||
Reference in New Issue
Block a user